diff --git a/CodeGeneration/Sources/SyntaxSupport/AttributeNodes.swift b/CodeGeneration/Sources/SyntaxSupport/AttributeNodes.swift
index fbcee6f0cf1..f547ec5f806 100644
--- a/CodeGeneration/Sources/SyntaxSupport/AttributeNodes.swift
+++ b/CodeGeneration/Sources/SyntaxSupport/AttributeNodes.swift
@@ -37,7 +37,8 @@ public let ATTRIBUTE_NODES: [Node] = [
     parserFunction: "parseAttribute",
     children: [
       Child(
-        name: "AtSignToken",
+        name: "AtSign",
+        deprecatedName: "AtSignToken",
         kind: .token(choices: [.token(tokenKind: "AtSignToken")]),
         documentation: "The `@` sign."
       ),
@@ -157,7 +158,8 @@ public let ATTRIBUTE_NODES: [Node] = [
     documentation: "The availability argument for the _specialize attribute",
     children: [
       Child(
-        name: "Label",
+        name: "AvailabilityLabel",
+        deprecatedName: "Label",
         kind: .token(choices: [.keyword(text: "availability")]),
         nameForDiagnostics: "label",
         documentation: "The label of the argument"
@@ -789,7 +791,8 @@ public let ATTRIBUTE_NODES: [Node] = [
         isOptional: true
       ),
       Child(
-        name: "Dot",
+        name: "Period",
+        deprecatedName: "Dot",
         kind: .token(choices: [.token(tokenKind: "PeriodToken")]),
         isOptional: true
       ),
@@ -840,7 +843,8 @@ public let ATTRIBUTE_NODES: [Node] = [
     ],
     children: [
       Child(
-        name: "Label",
+        name: "TargetLabel",
+        deprecatedName: "Label",
         kind: .token(choices: [.keyword(text: "target")]),
         nameForDiagnostics: "label",
         documentation: "The label of the argument"
diff --git a/CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift b/CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift
index 4374dc48010..cf04e67eb80 100644
--- a/CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift
+++ b/CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift
@@ -27,7 +27,8 @@ public let DECL_NODES: [Node] = [
         nameForDiagnostics: "name"
       ),
       Child(
-        name: "TrailingDot",
+        name: "TrailingPeriod",
+        deprecatedName: "TrailingDot",
         kind: .token(choices: [.token(tokenKind: "PeriodToken")]),
         isOptional: true
       ),
@@ -1436,7 +1437,8 @@ public let DECL_NODES: [Node] = [
         isOptional: true
       ),
       Child(
-        name: "PoundToken",
+        name: "Pound",
+        deprecatedName: "PoundToken",
         kind: .token(choices: [.token(tokenKind: "PoundToken")]),
         documentation: "The `#` sign."
       ),
@@ -1700,11 +1702,13 @@ public let DECL_NODES: [Node] = [
     nameForDiagnostics: "'#sourceLocation' arguments",
     children: [
       Child(
-        name: "FileArgLabel",
+        name: "FileLabel",
+        deprecatedName: "FileArgLabel",
         kind: .token(choices: [.keyword(text: "file")])
       ),
       Child(
-        name: "FileArgColon",
+        name: "FileColon",
+        deprecatedName: "FileArgColon",
         kind: .token(choices: [.token(tokenKind: "ColonToken")])
       ),
       Child(
@@ -1717,11 +1721,13 @@ public let DECL_NODES: [Node] = [
         kind: .token(choices: [.token(tokenKind: "CommaToken")])
       ),
       Child(
-        name: "LineArgLabel",
+        name: "LineLabel",
+        deprecatedName: "LineArgLabel",
         kind: .token(choices: [.keyword(text: "line")])
       ),
       Child(
-        name: "LineArgColon",
+        name: "LineColon",
+        deprecatedName: "LineArgColon",
         kind: .token(choices: [.token(tokenKind: "ColonToken")])
       ),
       Child(
@@ -1770,7 +1776,8 @@ public let DECL_NODES: [Node] = [
     documentation: "Specifies the precedence of an operator when used in an operation that includes optional chaining.",
     children: [
       Child(
-        name: "AssignmentKeyword",
+        name: "AssignmentLabel",
+        deprecatedName: "AssignmentKeyword",
         kind: .token(choices: [.keyword(text: "assignment")])
       ),
       Child(
@@ -1795,7 +1802,8 @@ public let DECL_NODES: [Node] = [
     documentation: "Specifies how a sequence of operators with the same precedence level are grouped together in the absence of grouping parentheses.",
     children: [
       Child(
-        name: "AssociativityKeyword",
+        name: "AssociativityLabel",
+        deprecatedName: "AssociativityKeyword",
         kind: .token(choices: [.keyword(text: "associativity")]),
         classification: "Keyword"
       ),
@@ -2034,7 +2042,8 @@ public let DECL_NODES: [Node] = [
         kind: .collection(kind: .codeBlockItemList, collectionElementName: "Statement")
       ),
       Child(
-        name: "EOFToken",
+        name: "EndOfFileToken",
+        deprecatedName: "EOFToken",
         kind: .token(choices: [.token(tokenKind: "EOFToken")])
       ),
     ]
diff --git a/CodeGeneration/Sources/SyntaxSupport/ExprNodes.swift b/CodeGeneration/Sources/SyntaxSupport/ExprNodes.swift
index 8db2476f9f6..2d5dd5d826c 100644
--- a/CodeGeneration/Sources/SyntaxSupport/ExprNodes.swift
+++ b/CodeGeneration/Sources/SyntaxSupport/ExprNodes.swift
@@ -77,7 +77,8 @@ public let EXPR_NODES: [Node] = [
         isOptional: true
       ),
       Child(
-        name: "ArrowToken",
+        name: "Arrow",
+        deprecatedName: "ArrowToken",
         kind: .token(choices: [.token(tokenKind: "ArrowToken")])
       ),
     ]
@@ -97,7 +98,8 @@ public let EXPR_NODES: [Node] = [
         kind: .node(kind: .expr)
       ),
       Child(
-        name: "AsTok",
+        name: "AsKeyword",
+        deprecatedName: "AsTok",
         kind: .token(choices: [.keyword(text: "as")])
       ),
       Child(
@@ -119,7 +121,8 @@ public let EXPR_NODES: [Node] = [
     nameForDiagnostics: nil,
     children: [
       Child(
-        name: "AssignToken",
+        name: "Equal",
+        deprecatedName: "AssignToken",
         kind: .token(choices: [.token(tokenKind: "EqualToken")])
       )
     ]
@@ -151,7 +154,8 @@ public let EXPR_NODES: [Node] = [
     nameForDiagnostics: "operator",
     children: [
       Child(
-        name: "OperatorToken",
+        name: "Operator",
+        deprecatedName: "OperatorToken",
         kind: .token(choices: [.token(tokenKind: "BinaryOperatorToken")])
       )
     ]
@@ -320,7 +324,8 @@ public let EXPR_NODES: [Node] = [
         isOptional: true
       ),
       Child(
-        name: "AssignToken",
+        name: "Equal",
+        deprecatedName: "AssignToken",
         kind: .token(choices: [.token(tokenKind: "EqualToken")]),
         isOptional: true
       ),
@@ -554,7 +559,8 @@ public let EXPR_NODES: [Node] = [
         isOptional: true
       ),
       Child(
-        name: "InTok",
+        name: "InKeyword",
+        deprecatedName: "InTok",
         kind: .token(choices: [.keyword(text: "in")])
       ),
     ]
@@ -727,7 +733,8 @@ public let EXPR_NODES: [Node] = [
         kind: .token(choices: [.token(tokenKind: "BackslashToken")])
       ),
       Child(
-        name: "Delimiter",
+        name: "RawStringDelimiter",
+        deprecatedName: "Delimiter",
         kind: .token(choices: [.token(tokenKind: "RawStringDelimiterToken")]),
         isOptional: true
       ),
@@ -760,7 +767,8 @@ public let EXPR_NODES: [Node] = [
     nameForDiagnostics: "floating literal",
     children: [
       Child(
-        name: "FloatingDigits",
+        name: "Digits",
+        deprecatedName: "FloatingDigits",
         kind: .token(choices: [.token(tokenKind: "FloatingLiteralToken")])
       )
     ]
@@ -982,7 +990,8 @@ public let EXPR_NODES: [Node] = [
         documentation: "The expression which will be checked to determine whether it can be cast to a specific type."
       ),
       Child(
-        name: "IsTok",
+        name: "IsKeyword",
+        deprecatedName: "IsTok",
         kind: .token(choices: [.keyword(text: "is")]),
         documentation: "The `is` keyword for this expression."
       ),
@@ -1107,7 +1116,8 @@ public let EXPR_NODES: [Node] = [
     nameForDiagnostics: "key path subscript component",
     children: [
       Child(
-        name: "LeftBracket",
+        name: "LeftSquare",
+        deprecatedName: "LeftBracket",
         kind: .token(choices: [.token(tokenKind: "LeftSquareToken")])
       ),
       Child(
@@ -1116,7 +1126,8 @@ public let EXPR_NODES: [Node] = [
         nameForDiagnostics: "arguments"
       ),
       Child(
-        name: "RightBracket",
+        name: "RightSquare",
+        deprecatedName: "RightBracket",
         kind: .token(choices: [.token(tokenKind: "RightSquareToken")])
       ),
     ]
@@ -1132,7 +1143,8 @@ public let EXPR_NODES: [Node] = [
     ],
     children: [
       Child(
-        name: "PoundToken",
+        name: "Pound",
+        deprecatedName: "PoundToken",
         kind: .token(choices: [.token(tokenKind: "PoundToken")]),
         documentation: "The `#` sign."
       ),
@@ -1185,7 +1197,8 @@ public let EXPR_NODES: [Node] = [
         isOptional: true
       ),
       Child(
-        name: "Dot",
+        name: "Period",
+        deprecatedName: "Dot",
         kind: .token(choices: [.token(tokenKind: "PeriodToken")])
       ),
       Child(
@@ -1356,7 +1369,8 @@ public let EXPR_NODES: [Node] = [
         kind: .node(kind: .expr)
       ),
       Child(
-        name: "OperatorToken",
+        name: "Operator",
+        deprecatedName: "OperatorToken",
         kind: .token(choices: [.token(tokenKind: "PostfixOperatorToken")])
       ),
     ]
@@ -1371,7 +1385,8 @@ public let EXPR_NODES: [Node] = [
     nameForDiagnostics: "operator",
     children: [
       Child(
-        name: "OperatorToken",
+        name: "Operator",
+        deprecatedName: "OperatorToken",
         kind: .token(choices: [.token(tokenKind: "PrefixOperatorToken")]),
         isOptional: true
       ),
@@ -1507,7 +1522,8 @@ public let EXPR_NODES: [Node] = [
         nameForDiagnostics: "called expression"
       ),
       Child(
-        name: "LeftBracket",
+        name: "LeftSquare",
+        deprecatedName: "LeftBracket",
         kind: .token(choices: [.token(tokenKind: "LeftSquareToken")])
       ),
       Child(
@@ -1516,7 +1532,8 @@ public let EXPR_NODES: [Node] = [
         nameForDiagnostics: "arguments"
       ),
       Child(
-        name: "RightBracket",
+        name: "RightSquare",
+        deprecatedName: "RightBracket",
         kind: .token(choices: [.token(tokenKind: "RightSquareToken")])
       ),
       Child(
@@ -1689,7 +1706,8 @@ public let EXPR_NODES: [Node] = [
         nameForDiagnostics: "first choice"
       ),
       Child(
-        name: "ColonMark",
+        name: "Colon",
+        deprecatedName: "ColonMark",
         kind: .token(choices: [.token(tokenKind: "ColonToken")])
       ),
       Child(
@@ -1812,7 +1830,8 @@ public let EXPR_NODES: [Node] = [
     nameForDiagnostics: "'as'",
     children: [
       Child(
-        name: "AsTok",
+        name: "AsKeyword",
+        deprecatedName: "AsTok",
         kind: .token(choices: [.keyword(text: "as")])
       ),
       Child(
@@ -1832,7 +1851,8 @@ public let EXPR_NODES: [Node] = [
     nameForDiagnostics: "'is'",
     children: [
       Child(
-        name: "IsTok",
+        name: "IsKeyword",
+        deprecatedName: "IsTok",
         kind: .token(choices: [.keyword(text: "is")])
       )
     ]
@@ -1867,7 +1887,8 @@ public let EXPR_NODES: [Node] = [
         kind: .node(kind: .expr)
       ),
       Child(
-        name: "ColonMark",
+        name: "Colon",
+        deprecatedName: "ColonMark",
         kind: .token(choices: [.token(tokenKind: "ColonToken")])
       ),
     ]
diff --git a/CodeGeneration/Sources/SyntaxSupport/GenericNodes.swift b/CodeGeneration/Sources/SyntaxSupport/GenericNodes.swift
index 8f08f554817..fc4923d111e 100644
--- a/CodeGeneration/Sources/SyntaxSupport/GenericNodes.swift
+++ b/CodeGeneration/Sources/SyntaxSupport/GenericNodes.swift
@@ -40,7 +40,8 @@ public let GENERIC_NODES: [Node] = [
     parserFunction: "parseGenericParameters",
     children: [
       Child(
-        name: "LeftAngleBracket",
+        name: "LeftAngle",
+        deprecatedName: "LeftAngleBracket",
         kind: .token(choices: [.token(tokenKind: "LeftAngleToken")])
       ),
       Child(
@@ -54,7 +55,8 @@ public let GENERIC_NODES: [Node] = [
         isOptional: true
       ),
       Child(
-        name: "RightAngleBracket",
+        name: "RightAngle",
+        deprecatedName: "RightAngleBracket",
         kind: .token(choices: [.token(tokenKind: "RightAngleToken")])
       ),
     ]
@@ -85,7 +87,8 @@ public let GENERIC_NODES: [Node] = [
         isOptional: true
       ),
       Child(
-        name: "Each",
+        name: "EachKeyword",
+        deprecatedName: "Each",
         kind: .token(choices: [.keyword(text: "each")]),
         nameForDiagnostics: "parameter pack specifier",
         isOptional: true
@@ -238,7 +241,8 @@ public let GENERIC_NODES: [Node] = [
     nameForDiagnostics: "primary associated type clause",
     children: [
       Child(
-        name: "LeftAngleBracket",
+        name: "LeftAngle",
+        deprecatedName: "LeftAngleBracket",
         kind: .token(choices: [.token(tokenKind: "LeftAngleToken")])
       ),
       Child(
@@ -246,7 +250,8 @@ public let GENERIC_NODES: [Node] = [
         kind: .collection(kind: .primaryAssociatedTypeList, collectionElementName: "PrimaryAssociatedType")
       ),
       Child(
-        name: "RightAngleBracket",
+        name: "RightAngle",
+        deprecatedName: "RightAngleBracket",
         kind: .token(choices: [.token(tokenKind: "RightAngleToken")])
       ),
     ]
diff --git a/CodeGeneration/Sources/SyntaxSupport/PatternNodes.swift b/CodeGeneration/Sources/SyntaxSupport/PatternNodes.swift
index 14f4df837fa..bee0913ac63 100644
--- a/CodeGeneration/Sources/SyntaxSupport/PatternNodes.swift
+++ b/CodeGeneration/Sources/SyntaxSupport/PatternNodes.swift
@@ -72,13 +72,15 @@ public let PATTERN_NODES: [Node] = [
     ],
     children: [
       Child(
-        name: "LabelName",
+        name: "Label",
+        deprecatedName: "LabelName",
         kind: .token(choices: [.token(tokenKind: "IdentifierToken")]),
         nameForDiagnostics: "label",
         isOptional: true
       ),
       Child(
-        name: "LabelColon",
+        name: "Colon",
+        deprecatedName: "LabelColon",
         kind: .token(choices: [.token(tokenKind: "ColonToken")]),
         isOptional: true
       ),
diff --git a/CodeGeneration/Sources/SyntaxSupport/StmtNodes.swift b/CodeGeneration/Sources/SyntaxSupport/StmtNodes.swift
index 8bc010f3088..8f45fd56fdc 100644
--- a/CodeGeneration/Sources/SyntaxSupport/StmtNodes.swift
+++ b/CodeGeneration/Sources/SyntaxSupport/StmtNodes.swift
@@ -389,12 +389,14 @@ public let STMT_NODES: [Node] = [
     nameForDiagnostics: "labeled statement",
     children: [
       Child(
-        name: "LabelName",
+        name: "Label",
+        deprecatedName: "LabelName",
         kind: .token(choices: [.token(tokenKind: "IdentifierToken")]),
         nameForDiagnostics: "label name"
       ),
       Child(
-        name: "LabelColon",
+        name: "Colon",
+        deprecatedName: "LabelColon",
         kind: .token(choices: [.token(tokenKind: "ColonToken")])
       ),
       Child(
diff --git a/CodeGeneration/Sources/SyntaxSupport/String+Extensions.swift b/CodeGeneration/Sources/SyntaxSupport/String+Extensions.swift
index a27b2276db2..9b5d73e9748 100644
--- a/CodeGeneration/Sources/SyntaxSupport/String+Extensions.swift
+++ b/CodeGeneration/Sources/SyntaxSupport/String+Extensions.swift
@@ -13,5 +13,13 @@
 public extension StringProtocol {
   var withFirstCharacterLowercased: String { prefix(1).lowercased() + dropFirst() }
   var withFirstCharacterUppercased: String { prefix(1).uppercased() + dropFirst() }
-  var backticked: String { "`\(self)`" }
+  var backtickedIfNeeded: String {
+    if KEYWORDS.contains(where: {
+      $0.name == self && $0.isLexerClassified
+    }) {
+      return "`\(self)`"
+    } else {
+      return String(self)
+    }
+  }
 }
diff --git a/CodeGeneration/Sources/SyntaxSupport/TypeNodes.swift b/CodeGeneration/Sources/SyntaxSupport/TypeNodes.swift
index 95c03585cd5..98c6139c064 100644
--- a/CodeGeneration/Sources/SyntaxSupport/TypeNodes.swift
+++ b/CodeGeneration/Sources/SyntaxSupport/TypeNodes.swift
@@ -215,7 +215,8 @@ public let TYPE_NODES: [Node] = [
     nameForDiagnostics: "generic argument clause",
     children: [
       Child(
-        name: "LeftAngleBracket",
+        name: "LeftAngle",
+        deprecatedName: "LeftAngleBracket",
         kind: .token(choices: [.token(tokenKind: "LeftAngleToken")])
       ),
       Child(
@@ -223,7 +224,8 @@ public let TYPE_NODES: [Node] = [
         kind: .collection(kind: .genericArgumentList, collectionElementName: "Argument")
       ),
       Child(
-        name: "RightAngleBracket",
+        name: "RightAngle",
+        deprecatedName: "RightAngleBracket",
         kind: .token(choices: [.token(tokenKind: "RightAngleToken")])
       ),
     ]
@@ -457,7 +459,8 @@ public let TYPE_NODES: [Node] = [
     ],
     children: [
       Child(
-        name: "InOut",
+        name: "InoutKeyword",
+        deprecatedName: "InOut",
         kind: .token(choices: [.keyword(text: "inout")]),
         isOptional: true
       ),
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/RawSyntaxNodesFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/RawSyntaxNodesFile.swift
index 7c998ee8264..319bed3c599 100644
--- a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/RawSyntaxNodesFile.swift
+++ b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/RawSyntaxNodesFile.swift
@@ -218,7 +218,7 @@ let rawSyntaxNodesFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
               ExprSyntax("layout.initialize(repeating: nil)")
               for (index, child) in node.children.enumerated() {
                 let optionalMark = child.isOptional ? "?" : ""
-                ExprSyntax("layout[\(raw: index)] = \(raw: child.varName)\(raw: optionalMark).raw")
+                ExprSyntax("layout[\(raw: index)] = \(raw: child.varName.backtickedIfNeeded)\(raw: optionalMark).raw")
                   .with(\.leadingTrivia, .newline)
               }
             }
@@ -238,7 +238,7 @@ let rawSyntaxNodesFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
         }
 
         for (index, child) in node.children.enumerated() {
-          try VariableDeclSyntax("public var \(raw: child.varName): Raw\(raw: child.type.buildable)") {
+          try VariableDeclSyntax("public var \(raw: child.varName.backtickedIfNeeded): Raw\(raw: child.type.buildable)") {
             let iuoMark = child.isOptional ? "" : "!"
 
             if child.syntaxNodeKind == .syntax {
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/RenamedChildrenCompatibilityFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/RenamedChildrenCompatibilityFile.swift
index 9906845510a..d0d130b5d6a 100644
--- a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/RenamedChildrenCompatibilityFile.swift
+++ b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/RenamedChildrenCompatibilityFile.swift
@@ -28,10 +28,10 @@ let renamedChildrenCompatibilityFile = try! SourceFileSyntax(leadingTrivia: copy
             @available(*, deprecated, renamed: "\(raw: child.varName)")
             public var \(raw: deprecatedVarName): \(raw: type) {
               get {
-                return \(raw: child.varName)
+                return \(raw: child.varName.backtickedIfNeeded)
               }
               set {
-                \(raw: child.varName) = newValue
+                \(raw: child.varName.backtickedIfNeeded) = newValue
               }
             }
             """
@@ -56,8 +56,8 @@ let renamedChildrenCompatibilityFile = try! SourceFileSyntax(leadingTrivia: copy
       }
 
       let deprecatedNames = layoutNode.children
-        .filter { !$0.isUnexpectedNodes }
-        .compactMap { $0.deprecatedName?.withFirstCharacterLowercased }
+        .filter { !$0.isUnexpectedNodes && $0.deprecatedName != nil }
+        .map { $0.varName }
         .joined(separator: ", ")
 
       try! InitializerDeclSyntax(
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxNodesFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxNodesFile.swift
index a8e460f56b2..db407798706 100644
--- a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxNodesFile.swift
+++ b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxNodesFile.swift
@@ -81,7 +81,7 @@ func syntaxNode(emitKind: SyntaxNodeKind) -> SourceFileSyntax {
         try! InitializerDeclSyntax("\(node.generateInitializerDeclHeader())") {
           let parameters = ClosureParameterListSyntax {
             for child in node.children {
-              ClosureParameterSyntax(firstName: .identifier(child.varName))
+              ClosureParameterSyntax(firstName: .identifier(child.varName.backtickedIfNeeded))
             }
           }
 
@@ -99,7 +99,7 @@ func syntaxNode(emitKind: SyntaxNodeKind) -> SourceFileSyntax {
             for child in node.children {
               ArrayElementSyntax(
                 expression: MemberAccessExprSyntax(
-                  base: child.type.optionalChained(expr: ExprSyntax("\(raw: child.varName)")),
+                  base: child.type.optionalChained(expr: ExprSyntax("\(raw: child.varName.backtickedIfNeeded)")),
                   dot: .periodToken(),
                   name: "raw"
                 )
@@ -161,7 +161,7 @@ func syntaxNode(emitKind: SyntaxNodeKind) -> SourceFileSyntax {
           try! VariableDeclSyntax(
             """
             \(raw: child.docComment)
-            public var \(raw: child.varName): \(type)
+            public var \(raw: child.varName.backtickedIfNeeded): \(type)
             """
           ) {
             AccessorDeclSyntax(accessorKind: .keyword(.get)) {
diff --git a/CodeGeneration/Tests/ValidateSyntaxNodes/Utils.swift b/CodeGeneration/Tests/ValidateSyntaxNodes/Utils.swift
index 7ae82ea2f2f..a06c4744420 100644
--- a/CodeGeneration/Tests/ValidateSyntaxNodes/Utils.swift
+++ b/CodeGeneration/Tests/ValidateSyntaxNodes/Utils.swift
@@ -22,6 +22,14 @@ extension Collection {
 }
 
 extension String {
+  func dropPrefix(_ suffix: String) -> String {
+    if hasPrefix(suffix) {
+      return String(self.dropFirst(suffix.count))
+    } else {
+      return self
+    }
+  }
+
   func dropSuffix(_ suffix: String) -> String {
     if hasSuffix(suffix) {
       return String(self.dropLast(suffix.count))
diff --git a/CodeGeneration/Tests/ValidateSyntaxNodes/ValidateSyntaxNodes.swift b/CodeGeneration/Tests/ValidateSyntaxNodes/ValidateSyntaxNodes.swift
index 75aa7ca6e4e..44b93ccce9c 100644
--- a/CodeGeneration/Tests/ValidateSyntaxNodes/ValidateSyntaxNodes.swift
+++ b/CodeGeneration/Tests/ValidateSyntaxNodes/ValidateSyntaxNodes.swift
@@ -99,6 +99,48 @@ class ValidateSyntaxNodes: XCTestCase {
     )
   }
 
+  /// Implementation detail of `testSingleTokenChoiceChildNaming`, validating a single child.
+  ///
+  /// - Returns: A failure message if validation failed, otherwise `nil`
+  private func validateSingleTokenChoiceChild(child: Child, childIndex: Int, in node: LayoutNode) -> String? {
+    guard case .token(choices: let tokenChoices, _, _) = child.kind, let choice = tokenChoices.only else {
+      return nil
+    }
+    switch choice {
+    case .keyword(text: let keyword):
+      if childIndex + 2 < node.children.count, case .token(choices: [.token(tokenKind: "ColonToken")], _, _) = node.children[childIndex + 2].kind {
+        if child.name != "\(keyword.withFirstCharacterUppercased)Label" {
+          return
+            "child '\(child.name)' has a single keyword as its only token choice and is followed by a colon. It should thus be named '\(keyword.withFirstCharacterUppercased)Label'"
+        }
+      } else {
+        if child.name != "\(keyword.withFirstCharacterUppercased)Keyword" {
+          return "child '\(child.name)' has a single keyword as its only token choice and should thus be named '\(keyword.withFirstCharacterUppercased)Keyword'"
+        }
+      }
+
+    case .token(tokenKind: "IdentifierToken"), .token(tokenKind: "IntegerLiteralToken"), .token(tokenKind: "FloatingLiteralToken"):
+      // We allow arbitrary naming of identifiers and literals
+      break
+    case .token(tokenKind: "CommaToken"):
+      if child.name != "TrailingComma" && child.name != "Comma" {
+        return "child '\(child.name)' has a comma keyword as its only token choice and should thus be named 'Comma' or 'TrailingComma'"
+      }
+    case .token(tokenKind: let tokenKind):
+      let expectedChildName =
+        tokenKind
+        .dropSuffix("Token")
+        .dropPrefix("Prefix")
+        .dropPrefix("Infix")
+        .dropPrefix("Postfix")
+        .dropPrefix("Binary")
+      if child.name != expectedChildName {
+        return "child '\(child.name)' has a token as its only token choice and should thus be named '\(expectedChildName)'"
+      }
+    }
+    return nil
+  }
+
   /// Checks standardized naming of children with a single token choice
   ///
   /// - If a child has a single keyword as its choice, it should be named `*Keyword` (e.g. `ImportKeyword`)
@@ -106,157 +148,45 @@ class ValidateSyntaxNodes: XCTestCase {
   func testSingleTokenChoiceChildNaming() {
     var failures: [ValidationFailure] = []
     for node in SYNTAX_NODES.compactMap(\.layoutNode) {
-      for child in node.children {
-        if case .token(choices: let tokenChoices, _, _) = child.kind,
-          let choice = tokenChoices.only
-        {
-          switch choice {
-          case .keyword(text: let keyword):
-            if child.name != "\(keyword.withFirstCharacterUppercased)Keyword" {
-              failures.append(
-                ValidationFailure(
-                  node: node.kind,
-                  message:
-                    "child '\(child.name)' has a single keyword as its only token choice and should thus be named '\(keyword.withFirstCharacterUppercased)Keyword'"
-                )
-              )
-            }
-          case .token(tokenKind: let tokenKind):
-            switch tokenKind {
-            case "IdentifierToken":
-              // We allow arbitrary naming of identifiers
-              break
-            case "CommaToken":
-              if child.name != "TrailingComma" && child.name != "Comma" {
-                failures.append(
-                  ValidationFailure(
-                    node: node.kind,
-                    message: "child '\(child.name)' has a comma keyword as its only token choice and should thus be named 'Comma' or 'TrailingComma'"
-                  )
-                )
-              }
-            default:
-              if child.name != tokenKind.dropSuffix("Token") {
-                failures.append(
-                  ValidationFailure(
-                    node: node.kind,
-                    message: "child '\(child.name)' has a token as its only token choice and should thus be named '\(tokenKind.dropSuffix("Token"))'"
-                  )
-                )
-              }
-            }
-          }
+      for (childIndex, child) in node.children.enumerated() {
+        if let failureMessage = validateSingleTokenChoiceChild(child: child, childIndex: childIndex, in: node) {
+          failures.append(ValidationFailure(node: node.kind, message: failureMessage))
         }
       }
     }
     assertFailuresMatchXFails(
       failures,
       expectedFailures: [
-        // MARK: Naming failures of children with a single keyword choice
+        // MARK: Naming of 'AsyncSpecifier' and 'ThrowsSpecifier'
+        // Even though these nodes only accept e.g. 'async' name them consistently with properties that accept 'async' and 'reasync'
         ValidationFailure(
           node: .accessorEffectSpecifiers,
           message: "child 'AsyncSpecifier' has a single keyword as its only token choice and should thus be named 'AsyncKeyword'"
+            // To be consistent with AsyncSpecifier properties that can be both 'async' and 'reasync'
         ),
         ValidationFailure(
           node: .accessorEffectSpecifiers,
           message: "child 'ThrowsSpecifier' has a single keyword as its only token choice and should thus be named 'ThrowsKeyword'"
-        ),
-        ValidationFailure(node: .asExpr, message: "child 'AsTok' has a single keyword as its only token choice and should thus be named 'AsKeyword'"),
-        ValidationFailure(
-          node: .availabilityEntry,
-          message: "child 'Label' has a single keyword as its only token choice and should thus be named 'AvailabilityKeyword'"
-        ),
-        ValidationFailure(
-          node: .backDeployedAttributeSpecList,
-          message: "child 'BeforeLabel' has a single keyword as its only token choice and should thus be named 'BeforeKeyword'"
-        ),
-        ValidationFailure(
-          node: .borrowExpr,
-          message: "child 'BorrowKeyword' has a single keyword as its only token choice and should thus be named '_borrowKeyword'"
-        ),
-        ValidationFailure(node: .closureSignature, message: "child 'InTok' has a single keyword as its only token choice and should thus be named 'InKeyword'"),
-        ValidationFailure(
-          node: .conventionAttributeArguments,
-          message: "child 'CTypeLabel' has a single keyword as its only token choice and should thus be named 'CTypeKeyword'"
-        ),
-        ValidationFailure(
-          node: .conventionWitnessMethodAttributeArguments,
-          message: "child 'WitnessMethodLabel' has a single keyword as its only token choice and should thus be named 'Witness_methodKeyword'"
+            // To be consistent with AsyncSpecifier properties that can be both 'async' and 'reasync'
         ),
         ValidationFailure(
           node: .deinitEffectSpecifiers,
           message: "child 'AsyncSpecifier' has a single keyword as its only token choice and should thus be named 'AsyncKeyword'"
-        ),
-        ValidationFailure(
-          node: .derivativeRegistrationAttributeArguments,
-          message: "child 'OfLabel' has a single keyword as its only token choice and should thus be named 'OfKeyword'"
-        ),
-        ValidationFailure(
-          node: .differentiabilityParamsClause,
-          message: "child 'WrtLabel' has a single keyword as its only token choice and should thus be named 'WrtKeyword'"
-        ),
-        ValidationFailure(
-          node: .dynamicReplacementArguments,
-          message: "child 'ForLabel' has a single keyword as its only token choice and should thus be named 'ForKeyword'"
-        ),
-        ValidationFailure(
-          node: .genericParameter,
-          message: "child 'Each' has a single keyword as its only token choice and should thus be named 'EachKeyword'"
-        ),
-        ValidationFailure(node: .isExpr, message: "child 'IsTok' has a single keyword as its only token choice and should thus be named 'IsKeyword'"),
-        ValidationFailure(
-          node: .originallyDefinedInArguments,
-          message: "child 'ModuleLabel' has a single keyword as its only token choice and should thus be named 'ModuleKeyword'"
-        ),
-        ValidationFailure(
-          node: .poundSourceLocationArgs,
-          message: "child 'FileArgLabel' has a single keyword as its only token choice and should thus be named 'FileKeyword'"
-        ),
-        ValidationFailure(
-          node: .poundSourceLocationArgs,
-          message: "child 'LineArgLabel' has a single keyword as its only token choice and should thus be named 'LineKeyword'"
-        ),
-        ValidationFailure(
-          node: .targetFunctionEntry,
-          message: "child 'Label' has a single keyword as its only token choice and should thus be named 'TargetKeyword'"
-        ),
-        ValidationFailure(
-          node: .tupleTypeElement,
-          message: "child 'InOut' has a single keyword as its only token choice and should thus be named 'InoutKeyword'"
+            // To be consistent with AsyncSpecifier properties that can be both 'async' and 'reasync'
         ),
         ValidationFailure(
           node: .typeEffectSpecifiers,
           message: "child 'AsyncSpecifier' has a single keyword as its only token choice and should thus be named 'AsyncKeyword'"
+            // To be consistent with AsyncSpecifier properties that can be both 'async' and 'reasync'
         ),
         ValidationFailure(
           node: .typeEffectSpecifiers,
           message: "child 'ThrowsSpecifier' has a single keyword as its only token choice and should thus be named 'ThrowsKeyword'"
+            // To be consistent with AsyncSpecifier properties that can be both 'async' and 'reasync'
         ),
-        ValidationFailure(
-          node: .unavailableFromAsyncArguments,
-          message: "child 'MessageLabel' has a single keyword as its only token choice and should thus be named 'MessageKeyword'"
-        ),
-        ValidationFailure(
-          node: .underscorePrivateAttributeArguments,
-          message: "child 'SourceFileLabel' has a single keyword as its only token choice and should thus be named 'SourceFileKeyword'"
-        ),
-        ValidationFailure(node: .unresolvedAsExpr, message: "child 'AsTok' has a single keyword as its only token choice and should thus be named 'AsKeyword'"),
-        ValidationFailure(node: .unresolvedIsExpr, message: "child 'IsTok' has a single keyword as its only token choice and should thus be named 'IsKeyword'"),
-
-        ValidationFailure(node: .arrowExpr, message: "child 'ArrowToken' has a token as its only token choice and should thus be named 'Arrow'"),
-        ValidationFailure(node: .assignmentExpr, message: "child 'AssignToken' has a token as its only token choice and should thus be named 'Equal'"),
-        ValidationFailure(node: .attribute, message: "child 'AtSignToken' has a token as its only token choice and should thus be named 'AtSign'"),
 
-        // MARK: Naming failures of children with a single token choice
-        ValidationFailure(
-          node: .binaryOperatorExpr,
-          message: "child 'OperatorToken' has a token as its only token choice and should thus be named 'BinaryOperator'"
-        ),
-        ValidationFailure(node: .closureCaptureItem, message: "child 'AssignToken' has a token as its only token choice and should thus be named 'Equal'"),
-        ValidationFailure(
-          node: .designatedTypeElement,
-          message: "child 'LeadingComma' has a comma keyword as its only token choice and should thus be named 'Comma' or 'TrailingComma'"
-        ),
+        // MARK: Two tokens with same kind in a node
+        // If there are two tokens of the same kind in a node, we can't follow the naming rule without conflict
         ValidationFailure(
           node: .differentiableAttributeArguments,
           message: "child 'DiffKindComma' has a comma keyword as its only token choice and should thus be named 'Comma' or 'TrailingComma'"
@@ -266,139 +196,93 @@ class ValidateSyntaxNodes: XCTestCase {
           message: "child 'DiffParamsComma' has a comma keyword as its only token choice and should thus be named 'Comma' or 'TrailingComma'"
         ),
         ValidationFailure(
-          node: .expressionSegment,
-          message: "child 'Delimiter' has a token as its only token choice and should thus be named 'RawStringDelimiter'"
-        ),
-        ValidationFailure(
-          node: .floatLiteralExpr,
-          message: "child 'FloatingDigits' has a token as its only token choice and should thus be named 'FloatingLiteral'"
-        ),
-        ValidationFailure(
-          node: .genericArgumentClause,
-          message: "child 'LeftAngleBracket' has a token as its only token choice and should thus be named 'LeftAngle'"
-        ),
-        ValidationFailure(
-          node: .genericArgumentClause,
-          message: "child 'RightAngleBracket' has a token as its only token choice and should thus be named 'RightAngle'"
-        ),
-        ValidationFailure(
-          node: .genericParameterClause,
-          message: "child 'LeftAngleBracket' has a token as its only token choice and should thus be named 'LeftAngle'"
-        ),
-        ValidationFailure(
-          node: .genericParameterClause,
-          message: "child 'RightAngleBracket' has a token as its only token choice and should thus be named 'RightAngle'"
-        ),
-        ValidationFailure(node: .importPathComponent, message: "child 'TrailingDot' has a token as its only token choice and should thus be named 'Period'"),
-        ValidationFailure(node: .inOutExpr, message: "child 'Ampersand' has a token as its only token choice and should thus be named 'PrefixAmpersand'"),
-        ValidationFailure(node: .integerLiteralExpr, message: "child 'Digits' has a token as its only token choice and should thus be named 'IntegerLiteral'"),
-        ValidationFailure(
-          node: .keyPathSubscriptComponent,
-          message: "child 'LeftBracket' has a token as its only token choice and should thus be named 'LeftSquare'"
-        ),
-        ValidationFailure(
-          node: .keyPathSubscriptComponent,
-          message: "child 'RightBracket' has a token as its only token choice and should thus be named 'RightSquare'"
-        ),
-        ValidationFailure(node: .labeledStmt, message: "child 'LabelColon' has a token as its only token choice and should thus be named 'Colon'"),
-        ValidationFailure(node: .layoutRequirement, message: "child 'Size' has a token as its only token choice and should thus be named 'IntegerLiteral'"),
-        ValidationFailure(
-          node: .layoutRequirement,
-          message: "child 'Alignment' has a token as its only token choice and should thus be named 'IntegerLiteral'"
-        ),
-        ValidationFailure(node: .macroExpansionDecl, message: "child 'PoundToken' has a token as its only token choice and should thus be named 'Pound'"),
-        ValidationFailure(node: .macroExpansionExpr, message: "child 'PoundToken' has a token as its only token choice and should thus be named 'Pound'"),
-        ValidationFailure(node: .memberAccessExpr, message: "child 'Dot' has a token as its only token choice and should thus be named 'Period'"),
-        ValidationFailure(
-          node: .opaqueReturnTypeOfAttributeArguments,
-          message: "child 'Ordinal' has a token as its only token choice and should thus be named 'IntegerLiteral'"
-        ),
-        ValidationFailure(
-          node: .optionalChainingExpr,
-          message: "child 'QuestionMark' has a token as its only token choice and should thus be named 'PostfixQuestionMark'"
+          node: .poundSourceLocationArgs,
+          message: "child 'FileColon' has a token as its only token choice and should thus be named 'Colon'"
+            // There are two colons in the node
         ),
         ValidationFailure(
-          node: .optionalType,
-          message: "child 'QuestionMark' has a token as its only token choice and should thus be named 'PostfixQuestionMark'"
+          node: .poundSourceLocationArgs,
+          message: "child 'LineColon' has a token as its only token choice and should thus be named 'Colon'"
         ),
         ValidationFailure(
-          node: .postfixUnaryExpr,
-          message: "child 'OperatorToken' has a token as its only token choice and should thus be named 'PostfixOperator'"
+          node: .regexLiteralExpr,
+          message: "child 'OpeningPounds' has a token as its only token choice and should thus be named 'ExtendedRegexDelimiter'"
         ),
         ValidationFailure(
-          node: .poundSourceLocationArgs,
-          message: "child 'FileArgColon' has a token as its only token choice and should thus be named 'Colon'"
+          node: .regexLiteralExpr,
+          message: "child 'OpenSlash' has a token as its only token choice and should thus be named 'RegexSlash'"
         ),
         ValidationFailure(
-          node: .poundSourceLocationArgs,
-          message: "child 'LineArgColon' has a token as its only token choice and should thus be named 'Colon'"
+          node: .regexLiteralExpr,
+          message: "child 'CloseSlash' has a token as its only token choice and should thus be named 'RegexSlash'"
+            // There are the opening and closing slashes in the node
         ),
         ValidationFailure(
-          node: .poundSourceLocationArgs,
-          message: "child 'LineNumber' has a token as its only token choice and should thus be named 'IntegerLiteral'"
+          node: .regexLiteralExpr,
+          message: "child 'ClosingPounds' has a token as its only token choice and should thus be named 'ExtendedRegexDelimiter'"
+            // There are the opening and closing ExtendedRegexDelimiter in the node
         ),
         ValidationFailure(
-          node: .prefixOperatorExpr,
-          message: "child 'OperatorToken' has a token as its only token choice and should thus be named 'PrefixOperator'"
+          node: .stringLiteralExpr,
+          message: "child 'OpenDelimiter' has a token as its only token choice and should thus be named 'RawStringDelimiter'"
         ),
         ValidationFailure(
-          node: .primaryAssociatedTypeClause,
-          message: "child 'LeftAngleBracket' has a token as its only token choice and should thus be named 'LeftAngle'"
+          node: .stringLiteralExpr,
+          message: "child 'CloseDelimiter' has a token as its only token choice and should thus be named 'RawStringDelimiter'"
         ),
+
+        // MARK: Tokens that contain underscores
         ValidationFailure(
-          node: .primaryAssociatedTypeClause,
-          message: "child 'RightAngleBracket' has a token as its only token choice and should thus be named 'RightAngle'"
+          node: .borrowExpr,
+          message: "child 'BorrowKeyword' has a single keyword as its only token choice and should thus be named '_borrowKeyword'"
+            // _borrow is underscored and thus BorrowKeyword is the correct spelling
         ),
-        ValidationFailure(node: .qualifiedDeclName, message: "child 'Dot' has a token as its only token choice and should thus be named 'Period'"),
         ValidationFailure(
-          node: .regexLiteralExpr,
-          message: "child 'OpeningPounds' has a token as its only token choice and should thus be named 'ExtendedRegexDelimiter'"
+          node: .conventionWitnessMethodAttributeArguments,
+          message:
+            "child 'WitnessMethodLabel' has a single keyword as its only token choice and is followed by a colon. It should thus be named 'Witness_methodLabel'"
+            // Witness_method has an underscore and thus WitnessMethod is the correct spelling
         ),
-        ValidationFailure(node: .regexLiteralExpr, message: "child 'OpenSlash' has a token as its only token choice and should thus be named 'RegexSlash'"),
+
+        // MARK: Repeat node type name
+        // If the node is named the same as the token, we don't need to repeat the entire token name
         ValidationFailure(
           node: .regexLiteralExpr,
           message: "child 'RegexPattern' has a token as its only token choice and should thus be named 'RegexLiteralPattern'"
+            // No point repeating the `Literal` because the node name alredy contains it
         ),
-        ValidationFailure(node: .regexLiteralExpr, message: "child 'CloseSlash' has a token as its only token choice and should thus be named 'RegexSlash'"),
-        ValidationFailure(
-          node: .regexLiteralExpr,
-          message: "child 'ClosingPounds' has a token as its only token choice and should thus be named 'ExtendedRegexDelimiter'"
-        ),
-        ValidationFailure(node: .sourceFile, message: "child 'EOFToken' has a token as its only token choice and should thus be named 'EOF'"),
         ValidationFailure(
-          node: .stringLiteralExpr,
-          message: "child 'OpenDelimiter' has a token as its only token choice and should thus be named 'RawStringDelimiter'"
+          node: .stringSegment,
+          message: "child 'Content' has a token as its only token choice and should thus be named 'StringSegment'"
+            // The node is already named `StringSegment`
         ),
+
+        // MARK: Miscellaneous
+        // This is the only place where we use LeadingComma, similar to 'TrailingComma'
         ValidationFailure(
-          node: .stringLiteralExpr,
-          message: "child 'CloseDelimiter' has a token as its only token choice and should thus be named 'RawStringDelimiter'"
+          node: .designatedTypeElement,
+          message: "child 'LeadingComma' has a comma keyword as its only token choice and should thus be named 'Comma' or 'TrailingComma'"
         ),
-        ValidationFailure(node: .stringSegment, message: "child 'Content' has a token as its only token choice and should thus be named 'StringSegment'"),
+        // This is similar to `TrailingComma`
         ValidationFailure(
-          node: .subscriptExpr,
-          message: "child 'LeftBracket' has a token as its only token choice and should thus be named 'LeftSquare'"
+          node: .importPathComponent,
+          message: "child 'TrailingPeriod' has a token as its only token choice and should thus be named 'Period'"
         ),
+        // We should explicitly mention token here because it’s not obvious that the end of a file is represented by a token
         ValidationFailure(
-          node: .subscriptExpr,
-          message: "child 'RightBracket' has a token as its only token choice and should thus be named 'RightSquare'"
+          node: .sourceFile,
+          message: "child 'EndOfFileToken' has a token as its only token choice and should thus be named 'EOF'"
         ),
+        // `~` is the only operator that’s allowed here
         ValidationFailure(
           node: .suppressedType,
-          message: "child 'WithoutTilde' has a token as its only token choice and should thus be named 'PrefixOperator'"
-        ),
-        ValidationFailure(
-          node: .ternaryExpr,
-          message: "child 'QuestionMark' has a token as its only token choice and should thus be named 'InfixQuestionMark'"
+          message: "child 'WithoutTilde' has a token as its only token choice and should thus be named 'Operator'"
         ),
-        ValidationFailure(node: .ternaryExpr, message: "child 'ColonMark' has a token as its only token choice and should thus be named 'Colon'"),
-        ValidationFailure(node: .tuplePatternElement, message: "child 'LabelColon' has a token as its only token choice and should thus be named 'Colon'"),
+        // default is not a function argument label here but a proper keyword
         ValidationFailure(
-          node: .unresolvedTernaryExpr,
-          message: "child 'QuestionMark' has a token as its only token choice and should thus be named 'InfixQuestionMark'"
+          node: .switchDefaultLabel,
+          message: "child 'DefaultKeyword' has a single keyword as its only token choice and is followed by a colon. It should thus be named 'DefaultLabel'"
         ),
-        ValidationFailure(node: .unresolvedTernaryExpr, message: "child 'ColonMark' has a token as its only token choice and should thus be named 'Colon'"),
-        ValidationFailure(node: .versionComponent, message: "child 'Number' has a token as its only token choice and should thus be named 'IntegerLiteral'"),
-        ValidationFailure(node: .versionTuple, message: "child 'Major' has a token as its only token choice and should thus be named 'IntegerLiteral'"),
       ]
     )
   }
diff --git a/Sources/SwiftBasicFormat/BasicFormat.swift b/Sources/SwiftBasicFormat/BasicFormat.swift
index 7bc8a65fa28..090218d75ff 100644
--- a/Sources/SwiftBasicFormat/BasicFormat.swift
+++ b/Sources/SwiftBasicFormat/BasicFormat.swift
@@ -265,8 +265,8 @@ open class BasicFormat: SyntaxRewriter {
       (nil, _):
       return false
     case (_, .colon):
-      if second?.keyPathInParent != \TernaryExprSyntax.colonMark
-        && second?.keyPathInParent != \UnresolvedTernaryExprSyntax.colonMark
+      if second?.keyPathInParent != \TernaryExprSyntax.colon
+        && second?.keyPathInParent != \UnresolvedTernaryExprSyntax.colon
       {
         return false
       }
diff --git a/Sources/SwiftIDEUtils/generated/SyntaxClassification.swift b/Sources/SwiftIDEUtils/generated/SyntaxClassification.swift
index 53b36f7b05a..0d97ac522d6 100644
--- a/Sources/SwiftIDEUtils/generated/SyntaxClassification.swift
+++ b/Sources/SwiftIDEUtils/generated/SyntaxClassification.swift
@@ -89,7 +89,7 @@ extension SyntaxClassification {
       return (.typeIdentifier, false)
     case \OperatorDeclSyntax.identifier:
       return (.operatorIdentifier, false)
-    case \PrecedenceGroupAssociativitySyntax.associativityKeyword:
+    case \PrecedenceGroupAssociativitySyntax.associativityLabel:
       return (.keyword, false)
     case \PrecedenceGroupRelationSyntax.higherThanOrLowerThanKeyword:
       return (.keyword, false)
diff --git a/Sources/SwiftOperators/OperatorTable+Folding.swift b/Sources/SwiftOperators/OperatorTable+Folding.swift
index dea122e274f..7c84a224812 100644
--- a/Sources/SwiftOperators/OperatorTable+Folding.swift
+++ b/Sources/SwiftOperators/OperatorTable+Folding.swift
@@ -61,10 +61,10 @@ extension OperatorTable {
   ) rethrows -> PrecedenceGroupName? {
     // A binary operator.
     if let binaryExpr = expr.as(BinaryOperatorExprSyntax.self) {
-      let operatorName = binaryExpr.operatorToken.text
+      let operatorName = binaryExpr.operator.text
       return try lookupOperatorPrecedenceGroupName(
         operatorName,
-        referencedFrom: Syntax(binaryExpr.operatorToken),
+        referencedFrom: Syntax(binaryExpr.operator),
         errorHandler: errorHandler
       )
     }
@@ -156,8 +156,8 @@ extension OperatorTable {
           questionMark: ternaryExpr.questionMark,
           ternaryExpr.unexpectedBetweenQuestionMarkAndFirstChoice,
           firstChoice: ternaryExpr.firstChoice,
-          ternaryExpr.unexpectedBetweenFirstChoiceAndColonMark,
-          colonMark: ternaryExpr.colonMark,
+          ternaryExpr.unexpectedBetweenFirstChoiceAndColon,
+          colon: ternaryExpr.colon,
           secondChoice: rhs
         )
       )
@@ -181,8 +181,8 @@ extension OperatorTable {
       return ExprSyntax(
         IsExprSyntax(
           expression: lhs,
-          isExpr.unexpectedBeforeIsTok,
-          isTok: isExpr.isTok,
+          isExpr.unexpectedBeforeIsKeyword,
+          isKeyword: isExpr.isKeyword,
           typeName: rhs.as(TypeExprSyntax.self)!.type
         )
       )
@@ -195,9 +195,9 @@ extension OperatorTable {
       return ExprSyntax(
         AsExprSyntax(
           expression: lhs,
-          asExpr.unexpectedBeforeAsTok,
-          asTok: asExpr.asTok,
-          asExpr.unexpectedBetweenAsTokAndQuestionOrExclamationMark,
+          asExpr.unexpectedBeforeAsKeyword,
+          asKeyword: asExpr.asKeyword,
+          asExpr.unexpectedBetweenAsKeywordAndQuestionOrExclamationMark,
           questionOrExclamationMark: asExpr.questionOrExclamationMark,
           typeName: rhs.as(TypeExprSyntax.self)!.type
         )
diff --git a/Sources/SwiftOperators/SyntaxSynthesis.swift b/Sources/SwiftOperators/SyntaxSynthesis.swift
index a0f5ce8184f..e359fa44cdd 100644
--- a/Sources/SwiftOperators/SyntaxSynthesis.swift
+++ b/Sources/SwiftOperators/SyntaxSynthesis.swift
@@ -100,7 +100,7 @@ extension PrecedenceGroup {
       groupAttributes.append(
         .init(
           PrecedenceGroupAssociativitySyntax(
-            associativityKeyword:
+            associativityLabel:
               .keyword(
                 .associativity,
                 leadingTrivia: [.newlines(1), .spaces(indentation)]
@@ -120,7 +120,7 @@ extension PrecedenceGroup {
       groupAttributes.append(
         .init(
           PrecedenceGroupAssignmentSyntax(
-            assignmentKeyword:
+            assignmentLabel:
               .keyword(
                 .assignment,
                 leadingTrivia: [.newlines(1), .spaces(indentation)]
diff --git a/Sources/SwiftParser/Attributes.swift b/Sources/SwiftParser/Attributes.swift
index e9575b9fb3d..8fb100b8849 100644
--- a/Sources/SwiftParser/Attributes.swift
+++ b/Sources/SwiftParser/Attributes.swift
@@ -149,7 +149,7 @@ extension Parser {
     return .attribute(
       RawAttributeSyntax(
         unexpectedBeforeAtSign,
-        atSignToken: atSign,
+        atSign: atSign,
         attributeName: attributeName,
         leftParen: nil,
         argument: nil,
@@ -187,7 +187,7 @@ extension Parser {
       return .attribute(
         RawAttributeSyntax(
           unexpectedBeforeAtSign,
-          atSignToken: atSign,
+          atSign: atSign,
           attributeName: attributeName,
           unexpectedBeforeLeftParen,
           leftParen: leftParen,
@@ -201,7 +201,7 @@ extension Parser {
       return .attribute(
         RawAttributeSyntax(
           unexpectedBeforeAtSign,
-          atSignToken: atSign,
+          atSign: atSign,
           attributeName: attributeName,
           leftParen: nil,
           argument: nil,
@@ -322,7 +322,7 @@ extension Parser {
       return .attribute(
         RawAttributeSyntax(
           unexpectedBeforeAtSign,
-          atSignToken: atSign,
+          atSign: atSign,
           unexpectedBeforeAttributeName,
           attributeName: RawTypeSyntax(RawSimpleTypeIdentifierSyntax(name: attributeName, genericArgumentClause: nil, arena: self.arena)),
           leftParen: nil,
@@ -351,7 +351,7 @@ extension Parser {
 
     return RawAttributeSyntax(
       unexpectedBeforeAtSign,
-      atSignToken: atSign,
+      atSign: atSign,
       unexpectedBeforeDifferentiable,
       attributeName: RawTypeSyntax(RawSimpleTypeIdentifierSyntax(name: differentiable, genericArgumentClause: nil, arena: self.arena)),
       unexpectedBeforeLeftParen,
@@ -493,7 +493,7 @@ extension Parser {
 
     return RawAttributeSyntax(
       unexpectedBeforeAtSign,
-      atSignToken: atSign,
+      atSign: atSign,
       unexpectedBeforeDerivative,
       attributeName: RawTypeSyntax(RawSimpleTypeIdentifierSyntax(name: derivative, genericArgumentClause: nil, arena: self.arena)),
       unexpectedBeforeLeftParen,
@@ -515,7 +515,7 @@ extension Parser {
 
     return RawAttributeSyntax(
       unexpectedBeforeAtSign,
-      atSignToken: atSign,
+      atSign: atSign,
       unexpectedBeforeTranspose,
       attributeName: RawTypeSyntax(RawSimpleTypeIdentifierSyntax(name: transpose, genericArgumentClause: nil, arena: self.arena)),
       unexpectedBeforeLeftParen,
@@ -663,7 +663,7 @@ extension Parser {
         elements.append(
           .targetFunctionEntry(
             RawTargetFunctionEntrySyntax(
-              label: ident,
+              targetLabel: ident,
               unexpectedBeforeColon,
               colon: colon,
               declname: declName,
@@ -680,7 +680,7 @@ extension Parser {
         elements.append(
           .availabilityEntry(
             RawAvailabilityEntrySyntax(
-              label: ident,
+              availabilityLabel: ident,
               unexpectedBeforeColon,
               colon: colon,
               availabilityArguments: availability,
diff --git a/Sources/SwiftParser/Declarations.swift b/Sources/SwiftParser/Declarations.swift
index 53b6e30f69d..2ba0711d6b5 100644
--- a/Sources/SwiftParser/Declarations.swift
+++ b/Sources/SwiftParser/Declarations.swift
@@ -352,7 +352,7 @@ extension Parser {
       elements.append(
         RawImportPathComponentSyntax(
           name: name,
-          trailingDot: keepGoing,
+          trailingPeriod: keepGoing,
           arena: self.arena
         )
       )
@@ -427,10 +427,10 @@ extension Parser {
     if let remainingTokens = remainingTokensIfMaximumNestingLevelReached() {
       return RawGenericParameterClauseSyntax(
         remainingTokens,
-        leftAngleBracket: missingToken(.leftAngle),
+        leftAngle: missingToken(.leftAngle),
         parameters: RawGenericParameterListSyntax(elements: [], arena: self.arena),
         genericWhereClause: nil,
-        rightAngleBracket: missingToken(.rightAngle),
+        rightAngle: missingToken(.rightAngle),
         arena: self.arena
       )
     }
@@ -497,7 +497,7 @@ extension Parser {
         elements.append(
           RawGenericParameterSyntax(
             attributes: attributes,
-            each: each,
+            eachKeyword: each,
             unexpectedBetweenEachAndName,
             name: name,
             unexpectedBetweenNameAndColon,
@@ -532,10 +532,10 @@ extension Parser {
       parameters = RawGenericParameterListSyntax(elements: elements, arena: self.arena)
     }
     return RawGenericParameterClauseSyntax(
-      leftAngleBracket: langle,
+      leftAngle: langle,
       parameters: parameters,
       genericWhereClause: whereClause,
-      rightAngleBracket: rangle,
+      rightAngle: rangle,
       arena: self.arena
     )
   }
@@ -1918,7 +1918,7 @@ extension Parser {
           elements.append(
             .precedenceGroupAssociativity(
               RawPrecedenceGroupAssociativitySyntax(
-                associativityKeyword: associativity,
+                associativityLabel: associativity,
                 unexpectedBeforeColon,
                 colon: colon,
                 unexpectedBeforeValue,
@@ -1940,7 +1940,7 @@ extension Parser {
           elements.append(
             .precedenceGroupAssignment(
               RawPrecedenceGroupAssignmentSyntax(
-                assignmentKeyword: assignmentKeyword,
+                assignmentLabel: assignmentKeyword,
                 unexpectedBeforeColon,
                 colon: colon,
                 unexpectedBeforeFlag,
@@ -2118,7 +2118,7 @@ extension Parser {
       attributes: attrs.attributes,
       modifiers: attrs.modifiers,
       unexpectedBeforePound,
-      poundToken: pound,
+      pound: pound,
       unexpectedBeforeMacro,
       macro: macro,
       genericArguments: generics,
diff --git a/Sources/SwiftParser/Directives.swift b/Sources/SwiftParser/Directives.swift
index 7829aa9ff22..ac5d3aeda22 100644
--- a/Sources/SwiftParser/Directives.swift
+++ b/Sources/SwiftParser/Directives.swift
@@ -239,16 +239,16 @@ extension Parser {
 
       args = RawPoundSourceLocationArgsSyntax(
         unexpectedBeforeFile,
-        fileArgLabel: file,
+        fileLabel: file,
         unexpectedBeforeFileColon,
-        fileArgColon: fileColon,
+        fileColon: fileColon,
         fileName: fileName,
         unexpectedBeforeComma,
         comma: comma,
         unexpectedBeforeLine,
-        lineArgLabel: line,
+        lineLabel: line,
         unexpectedBeforeLineColon,
-        lineArgColon: lineColon,
+        lineColon: lineColon,
         lineNumber: lineNumber,
         arena: self.arena
       )
diff --git a/Sources/SwiftParser/Expressions.swift b/Sources/SwiftParser/Expressions.swift
index 53bad15954d..7fae0480391 100644
--- a/Sources/SwiftParser/Expressions.swift
+++ b/Sources/SwiftParser/Expressions.swift
@@ -219,7 +219,7 @@ extension Parser {
     let asKeyword = self.eat(handle)
     let failable = self.consume(if: .postfixQuestionMark, .exclamationMark)
     let op = RawUnresolvedAsExprSyntax(
-      asTok: asKeyword,
+      asKeyword: asKeyword,
       questionOrExclamationMark: failable,
       arena: self.arena
     )
@@ -297,7 +297,7 @@ extension Parser {
     case (.binaryOperator, let handle)?:
       // Parse the operator.
       let operatorToken = self.eat(handle)
-      let op = RawBinaryOperatorExprSyntax(operatorToken: operatorToken, arena: arena)
+      let op = RawBinaryOperatorExprSyntax(operator: operatorToken, arena: arena)
       return (RawExprSyntax(op), nil)
 
     case (.infixQuestionMark, let handle)?:
@@ -311,7 +311,7 @@ extension Parser {
         questionMark: question,
         firstChoice: firstChoice,
         unexpectedBeforeColon,
-        colonMark: colon,
+        colon: colon,
         arena: self.arena
       )
 
@@ -330,7 +330,7 @@ extension Parser {
       case .none:
         let eq = self.eat(handle)
         let op = RawAssignmentExprSyntax(
-          assignToken: eq,
+          equal: eq,
           arena: self.arena
         )
         return (RawExprSyntax(op), nil)
@@ -339,7 +339,7 @@ extension Parser {
     case (.is, let handle)?:
       let isKeyword = self.eat(handle)
       let op = RawUnresolvedIsExprSyntax(
-        isTok: isKeyword,
+        isKeyword: isKeyword,
         arena: self.arena
       )
 
@@ -368,7 +368,7 @@ extension Parser {
       let op = RawArrowExprSyntax(
         effectSpecifiers: effectSpecifiers,
         unexpectedBeforeArrow,
-        arrowToken: arrow,
+        arrow: arrow,
         unexpectedAfterArrow,
         arena: self.arena
       )
@@ -589,7 +589,7 @@ extension Parser {
       let postfix = self.parseUnaryExpression(flavor, forDirective: forDirective, pattern: pattern)
       return RawExprSyntax(
         RawPrefixOperatorExprSyntax(
-          operatorToken: op,
+          operator: op,
           postfixExpression: postfix,
           arena: self.arena
         )
@@ -683,7 +683,7 @@ extension Parser {
     let memberAccess = RawMemberAccessExprSyntax(
       base: start,
       unexpectedPeriod,
-      dot: period,
+      period: period,
       name: name,
       declNameArguments: declNameArgs,
       arena: self.arena
@@ -835,10 +835,10 @@ extension Parser {
         leadingExpr = RawExprSyntax(
           RawSubscriptExprSyntax(
             calledExpression: leadingExpr,
-            leftBracket: lsquare,
+            leftSquare: lsquare,
             argumentList: RawTupleExprElementListSyntax(elements: args, arena: self.arena),
             unexpectedBeforeRSquare,
-            rightBracket: rsquare,
+            rightSquare: rsquare,
             trailingClosure: trailingClosure,
             additionalTrailingClosures: additionalTrailingClosures,
             arena: self.arena
@@ -903,7 +903,7 @@ extension Parser {
         leadingExpr = RawExprSyntax(
           RawPostfixUnaryExprSyntax(
             expression: leadingExpr,
-            operatorToken: op,
+            operator: op,
             arena: self.arena
           )
         )
@@ -1079,13 +1079,13 @@ extension Parser {
             period: period,
             component: .subscript(
               RawKeyPathSubscriptComponentSyntax(
-                leftBracket: lsquare,
+                leftSquare: lsquare,
                 argumentList: RawTupleExprElementListSyntax(
                   elements: args,
                   arena: self.arena
                 ),
                 unexpectedBeforeRSquare,
-                rightBracket: rsquare,
+                rightSquare: rsquare,
                 arena: self.arena
               )
             ),
@@ -1192,7 +1192,7 @@ extension Parser {
       let digits = self.eat(handle)
       return RawExprSyntax(
         RawFloatLiteralExprSyntax(
-          floatingDigits: digits,
+          digits: digits,
           arena: self.arena
         )
       )
@@ -1288,23 +1288,23 @@ extension Parser {
     case (.leftBrace, _)?:  // expr-closure
       return RawExprSyntax(self.parseClosureExpression())
     case (.period, let handle)?:  // .foo
-      let dot = self.eat(handle)
+      let period = self.eat(handle)
 
       // Special case ".<integer_literal>" like ".4".  This isn't valid, but the
       // developer almost certainly meant to use "0.4".  Diagnose this, and
       // recover as if they wrote that.
       if let integerLiteral = self.consume(if: .integerLiteral) {
-        let text = arena.intern("0" + String(syntaxText: dot.tokenText) + String(syntaxText: integerLiteral.tokenText))
+        let text = arena.intern("0" + String(syntaxText: period.tokenText) + String(syntaxText: integerLiteral.tokenText))
         return RawExprSyntax(
           RawFloatLiteralExprSyntax(
-            floatingDigits: RawTokenSyntax(
+            digits: RawTokenSyntax(
               missing: .floatingLiteral,
               text: text,
               arena: self.arena
             ),
             RawUnexpectedNodesSyntax(
               elements: [
-                RawSyntax(dot),
+                RawSyntax(period),
                 RawSyntax(integerLiteral),
               ],
               arena: self.arena
@@ -1318,7 +1318,7 @@ extension Parser {
       return RawExprSyntax(
         RawMemberAccessExprSyntax(
           base: nil,
-          dot: dot,
+          period: period,
           name: name,
           declNameArguments: args,
           arena: self.arena
@@ -1465,7 +1465,7 @@ extension Parser {
 
     return RawMacroExpansionExprSyntax(
       unexpectedBeforePound,
-      poundToken: pound,
+      pound: pound,
       unexpectedBeforeMacro,
       macro: macro,
       genericArguments: generics,
@@ -1889,21 +1889,21 @@ extension Parser {
           // followed by an expression.
           let unexpectedBeforeName: RawUnexpectedNodesSyntax?
           let name: RawTokenSyntax?
-          let unexpectedBeforeAssignToken: RawUnexpectedNodesSyntax?
-          let assignToken: RawTokenSyntax?
+          let unexpectedBeforeEqual: RawUnexpectedNodesSyntax?
+          let equal: RawTokenSyntax?
           let expression: RawExprSyntax
           if self.peek().rawTokenKind == .equal {
             // The name is a new declaration.
             (unexpectedBeforeName, name) = self.expect(.identifier, TokenSpec(.self, remapping: .identifier), default: .identifier)
-            (unexpectedBeforeAssignToken, assignToken) = self.expect(.equal)
+            (unexpectedBeforeEqual, equal) = self.expect(.equal)
             expression = self.parseExpression()
           } else {
             // This is the simple case - the identifier is both the name and
             // the expression to capture.
             unexpectedBeforeName = nil
             name = nil
-            unexpectedBeforeAssignToken = nil
-            assignToken = nil
+            unexpectedBeforeEqual = nil
+            equal = nil
             expression = RawExprSyntax(self.parseIdentifierExpression())
           }
 
@@ -1913,8 +1913,8 @@ extension Parser {
               specifier: specifier,
               unexpectedBeforeName,
               name: name,
-              unexpectedBeforeAssignToken,
-              assignToken: assignToken,
+              unexpectedBeforeEqual,
+              equal: equal,
               expression: expression,
               trailingComma: keepGoing,
               arena: self.arena
@@ -1989,15 +1989,15 @@ extension Parser {
     }
 
     // Parse the 'in'.
-    let (unexpectedBeforeInTok, inTok) = self.expect(.keyword(.in))
+    let (unexpectedBeforeInKeyword, inKeyword) = self.expect(.keyword(.in))
     return RawClosureSignatureSyntax(
       attributes: attrs,
       capture: captures,
       input: input,
       effectSpecifiers: effectSpecifiers,
       output: output,
-      unexpectedBeforeInTok,
-      inTok: inTok,
+      unexpectedBeforeInKeyword,
+      inKeyword: inKeyword,
       arena: self.arena
     )
   }
@@ -2472,7 +2472,7 @@ extension Parser {
       let (unexpectedBeforeIdent, ident) = self.expectIdentifier()
 
       unknownAttr = RawAttributeSyntax(
-        atSignToken: at,
+        atSign: at,
         unexpectedBeforeIdent,
         attributeName: RawTypeSyntax(RawSimpleTypeIdentifierSyntax(name: ident, genericArgumentClause: nil, arena: self.arena)),
         leftParen: nil,
diff --git a/Sources/SwiftParser/Names.swift b/Sources/SwiftParser/Names.swift
index f1bb63824c7..d837eb112f2 100644
--- a/Sources/SwiftParser/Names.swift
+++ b/Sources/SwiftParser/Names.swift
@@ -145,13 +145,13 @@ extension Parser {
 extension Parser {
   mutating func parseQualifiedDeclarationName() -> RawQualifiedDeclNameSyntax {
     let type: RawTypeSyntax?
-    let dot: RawTokenSyntax?
+    let period: RawTokenSyntax?
     if self.lookahead().canParseBaseTypeForQualifiedDeclName() {
       type = self.parseQualifiedTypeIdentifier()
-      dot = self.consumePrefix(".", as: .period)
+      period = self.consumePrefix(".", as: .period)
     } else {
       type = nil
-      dot = nil
+      period = nil
     }
 
     let (name, args) = self.parseDeclNameRef([
@@ -161,7 +161,7 @@ extension Parser {
     ])
     return RawQualifiedDeclNameSyntax(
       baseType: type,
-      dot: dot,
+      period: period,
       name: name,
       arguments: args,
       arena: self.arena
diff --git a/Sources/SwiftParser/Nominals.swift b/Sources/SwiftParser/Nominals.swift
index ee5d3040650..c4204f9804c 100644
--- a/Sources/SwiftParser/Nominals.swift
+++ b/Sources/SwiftParser/Nominals.swift
@@ -361,10 +361,10 @@ extension Parser {
       (unexpectedBeforeRangle, rangle) = self.expect(.rightAngle)
     }
     return RawPrimaryAssociatedTypeClauseSyntax(
-      leftAngleBracket: langle,
+      leftAngle: langle,
       primaryAssociatedTypeList: RawPrimaryAssociatedTypeListSyntax(elements: associatedTypes, arena: self.arena),
       unexpectedBeforeRangle,
-      rightAngleBracket: rangle,
+      rightAngle: rangle,
       arena: self.arena
     )
   }
diff --git a/Sources/SwiftParser/Patterns.swift b/Sources/SwiftParser/Patterns.swift
index 2df50d56dd2..bcd1b981fea 100644
--- a/Sources/SwiftParser/Patterns.swift
+++ b/Sources/SwiftParser/Patterns.swift
@@ -201,8 +201,8 @@ extension Parser {
         elements: [
           RawTuplePatternElementSyntax(
             remainingTokens,
-            labelName: nil,
-            labelColon: nil,
+            label: nil,
+            colon: nil,
             pattern: RawPatternSyntax(RawMissingPatternSyntax(arena: self.arena)),
             trailingComma: nil,
             arena: self.arena
@@ -237,8 +237,8 @@ extension Parser {
         keepGoing = trailingComma != nil
         elements.append(
           RawTuplePatternElementSyntax(
-            labelName: label,
-            labelColon: colon,
+            label: label,
+            colon: colon,
             pattern: pattern,
             trailingComma: trailingComma,
             arena: self.arena
diff --git a/Sources/SwiftParser/Statements.swift b/Sources/SwiftParser/Statements.swift
index 7b4779398f1..e5b60212f7a 100644
--- a/Sources/SwiftParser/Statements.swift
+++ b/Sources/SwiftParser/Statements.swift
@@ -84,8 +84,8 @@ extension Parser {
       }
       return RawStmtSyntax(
         RawLabeledStmtSyntax(
-          labelName: label.label,
-          labelColon: label.colon,
+          label: label.label,
+          colon: label.colon,
           statement: RawStmtSyntax(stmt),
           arena: self.arena
         )
diff --git a/Sources/SwiftParser/StringLiterals.swift b/Sources/SwiftParser/StringLiterals.swift
index 48a90dcd2cb..081edb3a1ab 100644
--- a/Sources/SwiftParser/StringLiterals.swift
+++ b/Sources/SwiftParser/StringLiterals.swift
@@ -533,7 +533,7 @@ extension Parser {
             RawExpressionSegmentSyntax(
               backslash: backslash,
               unexpectedBeforeDelimiter,
-              delimiter: delimiter,
+              rawStringDelimiter: delimiter,
               leftParen: leftParen,
               expressions: expressions,
               RawUnexpectedNodesSyntax(unexpectedBeforeRightParen, arena: self.arena),
diff --git a/Sources/SwiftParser/TopLevel.swift b/Sources/SwiftParser/TopLevel.swift
index 90baaeb7ea0..c295d4e23f2 100644
--- a/Sources/SwiftParser/TopLevel.swift
+++ b/Sources/SwiftParser/TopLevel.swift
@@ -51,7 +51,7 @@ extension Parser {
     return .init(
       statements: items,
       RawUnexpectedNodesSyntax(unexpectedBeforeEof, arena: self.arena),
-      eofToken: eof,
+      endOfFileToken: eof,
       arena: self.arena
     )
   }
diff --git a/Sources/SwiftParser/Types.swift b/Sources/SwiftParser/Types.swift
index e226092f88d..e3453b61f22 100644
--- a/Sources/SwiftParser/Types.swift
+++ b/Sources/SwiftParser/Types.swift
@@ -78,7 +78,7 @@ extension Parser {
         parameters = RawTupleTypeElementListSyntax(
           elements: [
             RawTupleTypeElementSyntax(
-              inOut: nil,
+              inoutKeyword: nil,
               name: nil,
               secondName: nil,
               colon: nil,
@@ -458,9 +458,9 @@ extension Parser {
       args = RawGenericArgumentListSyntax(elements: arguments, arena: self.arena)
     }
     return RawGenericArgumentClauseSyntax(
-      leftAngleBracket: langle,
+      leftAngle: langle,
       arguments: args,
-      rightAngleBracket: rangle,
+      rightAngle: rangle,
       arena: self.arena
     )
   }
@@ -541,7 +541,7 @@ extension Parser {
         {
           elements.append(
             RawTupleTypeElementSyntax(
-              inOut: nil,
+              inoutKeyword: nil,
               name: nil,
               secondName: nil,
               RawUnexpectedNodesSyntax(combining: misplacedSpecifiers, unexpectedBeforeColon, arena: self.arena),
@@ -567,7 +567,7 @@ extension Parser {
         keepGoing = trailingComma != nil
         elements.append(
           RawTupleTypeElementSyntax(
-            inOut: nil,
+            inoutKeyword: nil,
             RawUnexpectedNodesSyntax(combining: misplacedSpecifiers, unexpectedBeforeFirst, arena: self.arena),
             name: first,
             unexpectedBeforeSecond,
diff --git a/Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift b/Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift
index e2061e0f644..c72c8b10fdc 100644
--- a/Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift
+++ b/Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift
@@ -497,7 +497,7 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
     if shouldSkip(node) {
       return .skipChildren
     }
-    handleMisplacedEffectSpecifiersAfterArrow(effectSpecifiers: node.effectSpecifiers, misplacedSpecifiers: node.unexpectedAfterArrowToken)
+    handleMisplacedEffectSpecifiersAfterArrow(effectSpecifiers: node.effectSpecifiers, misplacedSpecifiers: node.unexpectedAfterArrow)
 
     return .visitChildren
   }
@@ -914,8 +914,8 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
     if shouldSkip(node) {
       return .skipChildren
     }
-    if node.floatingDigits.isMissing,
-      let (period, integerLiteral) = node.unexpectedAfterFloatingDigits?.twoPresentTokens(
+    if node.digits.isMissing,
+      let (period, integerLiteral) = node.unexpectedAfterDigits?.twoPresentTokens(
         firstSatisfying: { $0.tokenKind == .period },
         secondSatisfying: { $0.tokenKind.isIntegerLiteral }
       )
@@ -927,13 +927,13 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
           FixIt(
             message: InsertFixIt(tokenToBeInserted: .integerLiteral("0")),
             changes: [
-              .makePresent(node.floatingDigits),
+              .makePresent(node.digits),
               .makeMissing(period),
               .makeMissing(integerLiteral),
             ]
           )
         ],
-        handledNodes: [node.floatingDigits.id, period.id, integerLiteral.id]
+        handledNodes: [node.digits.id, period.id, integerLiteral.id]
       )
     }
     return .visitChildren
@@ -1022,7 +1022,7 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
       return .skipChildren
     }
     // Emit a custom diagnostic for an unexpected '...' after the type name.
-    if node.each?.isPresent ?? false {
+    if node.eachKeyword?.isPresent ?? false {
       removeToken(
         node.unexpectedBetweenNameAndColon,
         where: { $0.tokenKind == .ellipsis },
@@ -1030,7 +1030,7 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
       )
     } else if let unexpected = node.unexpectedBetweenNameAndColon,
       let unexpectedEllipsis = unexpected.onlyPresentToken(where: { $0.tokenKind == .ellipsis }),
-      let each = node.each
+      let each = node.eachKeyword
     {
       addDiagnostic(
         unexpected,
@@ -1068,7 +1068,7 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
         addDiagnostic(unexpected, UnknownDirectiveError(unexpected: unexpected), handledNodes: [unexpected.id, node.identifier.id])
       } else if let availability = unexpected.first?.as(AvailabilityConditionSyntax.self) {
         if let prefixOperatorExpr = node.parent?.as(PrefixOperatorExprSyntax.self),
-          let operatorToken = prefixOperatorExpr.operatorToken,
+          let operatorToken = prefixOperatorExpr.operator,
           operatorToken.text == "!",
           let conditionElement = prefixOperatorExpr.parent?.as(ConditionElementSyntax.self)
         {
@@ -1232,8 +1232,8 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
     }
 
     handleExtraneousWhitespaceError(
-      unexpectedBefore: node.unexpectedBetweenModifiersAndPoundToken,
-      token: node.poundToken
+      unexpectedBefore: node.unexpectedBetweenModifiersAndPound,
+      token: node.pound
     )
 
     return .visitChildren
@@ -1245,8 +1245,8 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
     }
 
     handleExtraneousWhitespaceError(
-      unexpectedBefore: node.unexpectedBeforePoundToken,
-      token: node.poundToken
+      unexpectedBefore: node.unexpectedBeforePound,
+      token: node.pound
     )
 
     return .visitChildren
@@ -1469,7 +1469,7 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
     if shouldSkip(node) {
       return .skipChildren
     }
-    if let extraneous = node.unexpectedBetweenStatementsAndEOFToken, !extraneous.isEmpty {
+    if let extraneous = node.unexpectedBetweenStatementsAndEndOfFileToken, !extraneous.isEmpty {
       addDiagnostic(extraneous, ExtaneousCodeAtTopLevel(extraneousCode: extraneous), handledNodes: [extraneous.id])
     }
     return .visitChildren
@@ -1666,7 +1666,7 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
       return .skipChildren
     }
     exchangeTokens(
-      unexpected: node.unexpectedBetweenInOutAndName,
+      unexpected: node.unexpectedBetweenInoutKeywordAndName,
       unexpectedTokenCondition: { TypeSpecifier(token: $0) != nil },
       correctTokens: [node.type.as(AttributedTypeSyntax.self)?.specifier],
       message: { SpecifierOnParameterName(misplacedSpecifiers: $0) },
@@ -1796,33 +1796,33 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
     if shouldSkip(node) {
       return .skipChildren
     }
-    if node.colonMark.isMissing {
+    if node.colon.isMissing {
       if let siblings = node.parent?.children(viewMode: .all),
         let nextSibling = siblings[siblings.index(after: node.index)...].first,
         nextSibling.is(MissingExprSyntax.self)
       {
         addDiagnostic(
-          node.colonMark,
+          node.colon,
           .missingColonAndExprInTernaryExpr,
           fixIts: [
             FixIt(
-              message: InsertTokenFixIt(missingNodes: [Syntax(node.colonMark), Syntax(nextSibling)]),
+              message: InsertTokenFixIt(missingNodes: [Syntax(node.colon), Syntax(nextSibling)]),
               changes: [
-                .makePresent(node.colonMark),
+                .makePresent(node.colon),
                 .makePresent(nextSibling),
               ]
             )
           ],
-          handledNodes: [node.colonMark.id, nextSibling.id]
+          handledNodes: [node.colon.id, nextSibling.id]
         )
       } else {
         addDiagnostic(
-          node.colonMark,
+          node.colon,
           .missingColonInTernaryExpr,
           fixIts: [
-            FixIt(message: InsertTokenFixIt(missingNodes: [Syntax(node.colonMark)]), changes: .makePresent(node.colonMark))
+            FixIt(message: InsertTokenFixIt(missingNodes: [Syntax(node.colon)]), changes: .makePresent(node.colon))
           ],
-          handledNodes: [node.colonMark.id]
+          handledNodes: [node.colon.id]
         )
       }
     }
diff --git a/Sources/SwiftParserDiagnostics/generated/ChildNameForDiagnostics.swift b/Sources/SwiftParserDiagnostics/generated/ChildNameForDiagnostics.swift
index b8d059ea252..8268390ac52 100644
--- a/Sources/SwiftParserDiagnostics/generated/ChildNameForDiagnostics.swift
+++ b/Sources/SwiftParserDiagnostics/generated/ChildNameForDiagnostics.swift
@@ -48,7 +48,7 @@ private func childNameForDiagnostics(_ keyPath: AnyKeyPath) -> String? {
     return "generic where clause"
   case \AttributeSyntax.attributeName:
     return "name"
-  case \AvailabilityEntrySyntax.label:
+  case \AvailabilityEntrySyntax.availabilityLabel:
     return "label"
   case \AvailabilityLabeledArgumentSyntax.label:
     return "label"
@@ -172,7 +172,7 @@ private func childNameForDiagnostics(_ keyPath: AnyKeyPath) -> String? {
     return "type"
   case \FunctionParameterSyntax.defaultArgument:
     return "default argument"
-  case \GenericParameterSyntax.each:
+  case \GenericParameterSyntax.eachKeyword:
     return "parameter pack specifier"
   case \GenericParameterSyntax.name:
     return "name"
@@ -220,7 +220,7 @@ private func childNameForDiagnostics(_ keyPath: AnyKeyPath) -> String? {
     return "label"
   case \LabeledSpecializeEntrySyntax.value:
     return "value"
-  case \LabeledStmtSyntax.labelName:
+  case \LabeledStmtSyntax.label:
     return "label name"
   case \LayoutRequirementSyntax.typeIdentifier:
     return "constrained type"
@@ -334,7 +334,7 @@ private func childNameForDiagnostics(_ keyPath: AnyKeyPath) -> String? {
     return "trailing closures"
   case \SwitchCaseSyntax.label:
     return "label"
-  case \TargetFunctionEntrySyntax.label:
+  case \TargetFunctionEntrySyntax.targetLabel:
     return "label"
   case \TargetFunctionEntrySyntax.declname:
     return "declaration name"
@@ -348,7 +348,7 @@ private func childNameForDiagnostics(_ keyPath: AnyKeyPath) -> String? {
     return "label"
   case \TupleExprElementSyntax.expression:
     return "value"
-  case \TuplePatternElementSyntax.labelName:
+  case \TuplePatternElementSyntax.label:
     return "label"
   case \TupleTypeElementSyntax.name:
     return "name"
diff --git a/Sources/SwiftRefactor/FormatRawStringLiteral.swift b/Sources/SwiftRefactor/FormatRawStringLiteral.swift
index ee204c057bb..efe09adc86a 100644
--- a/Sources/SwiftRefactor/FormatRawStringLiteral.swift
+++ b/Sources/SwiftRefactor/FormatRawStringLiteral.swift
@@ -36,9 +36,9 @@ public struct FormatRawStringLiteral: SyntaxRefactoringProvider {
     for segment in lit.segments {
       switch segment {
       case .expressionSegment(let expr):
-        if let delimiter = expr.delimiter {
+        if let rawStringDelimiter = expr.rawStringDelimiter {
           // Pick up any delimiters in interpolation segments \#...#(...)
-          maximumHashes = max(maximumHashes, delimiter.text.longestRun(of: "#"))
+          maximumHashes = max(maximumHashes, rawStringDelimiter.text.longestRun(of: "#"))
         }
       case .stringSegment(let string):
         // Find the longest run of # characters in the content of the literal.
diff --git a/Sources/SwiftRefactor/OpaqueParameterToGeneric.swift b/Sources/SwiftRefactor/OpaqueParameterToGeneric.swift
index eaf3f236519..90351a73231 100644
--- a/Sources/SwiftRefactor/OpaqueParameterToGeneric.swift
+++ b/Sources/SwiftRefactor/OpaqueParameterToGeneric.swift
@@ -56,7 +56,7 @@ fileprivate class SomeParameterRewriter: SyntaxRewriter {
 
     let genericParam = GenericParameterSyntax(
       attributes: nil,
-      each: nil,
+      eachKeyword: nil,
       name: paramNameSyntax,
       colon: colon,
       inheritedType: inheritedType,
@@ -159,10 +159,10 @@ public struct OpaqueParameterToGeneric: SyntaxRefactoringProvider {
       )
     } else {
       newGenericParamClause = GenericParameterClauseSyntax(
-        leftAngleBracket: .leftAngleToken(),
+        leftAngle: .leftAngleToken(),
         parameters: newGenericParamSyntax,
         genericWhereClause: nil,
-        rightAngleBracket: .rightAngleToken()
+        rightAngle: .rightAngleToken()
       )
     }
 
diff --git a/Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift b/Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift
index d109359f5aa..271eba4a1e4 100644
--- a/Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift
+++ b/Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift
@@ -189,22 +189,22 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "unexpectedBeforeEffectSpecifiers"
   case \ArrowExprSyntax.effectSpecifiers:
     return "effectSpecifiers"
-  case \ArrowExprSyntax.unexpectedBetweenEffectSpecifiersAndArrowToken:
-    return "unexpectedBetweenEffectSpecifiersAndArrowToken"
-  case \ArrowExprSyntax.arrowToken:
-    return "arrowToken"
-  case \ArrowExprSyntax.unexpectedAfterArrowToken:
-    return "unexpectedAfterArrowToken"
+  case \ArrowExprSyntax.unexpectedBetweenEffectSpecifiersAndArrow:
+    return "unexpectedBetweenEffectSpecifiersAndArrow"
+  case \ArrowExprSyntax.arrow:
+    return "arrow"
+  case \ArrowExprSyntax.unexpectedAfterArrow:
+    return "unexpectedAfterArrow"
   case \AsExprSyntax.unexpectedBeforeExpression:
     return "unexpectedBeforeExpression"
   case \AsExprSyntax.expression:
     return "expression"
-  case \AsExprSyntax.unexpectedBetweenExpressionAndAsTok:
-    return "unexpectedBetweenExpressionAndAsTok"
-  case \AsExprSyntax.asTok:
-    return "asTok"
-  case \AsExprSyntax.unexpectedBetweenAsTokAndQuestionOrExclamationMark:
-    return "unexpectedBetweenAsTokAndQuestionOrExclamationMark"
+  case \AsExprSyntax.unexpectedBetweenExpressionAndAsKeyword:
+    return "unexpectedBetweenExpressionAndAsKeyword"
+  case \AsExprSyntax.asKeyword:
+    return "asKeyword"
+  case \AsExprSyntax.unexpectedBetweenAsKeywordAndQuestionOrExclamationMark:
+    return "unexpectedBetweenAsKeywordAndQuestionOrExclamationMark"
   case \AsExprSyntax.questionOrExclamationMark:
     return "questionOrExclamationMark"
   case \AsExprSyntax.unexpectedBetweenQuestionOrExclamationMarkAndTypeName:
@@ -213,12 +213,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "typeName"
   case \AsExprSyntax.unexpectedAfterTypeName:
     return "unexpectedAfterTypeName"
-  case \AssignmentExprSyntax.unexpectedBeforeAssignToken:
-    return "unexpectedBeforeAssignToken"
-  case \AssignmentExprSyntax.assignToken:
-    return "assignToken"
-  case \AssignmentExprSyntax.unexpectedAfterAssignToken:
-    return "unexpectedAfterAssignToken"
+  case \AssignmentExprSyntax.unexpectedBeforeEqual:
+    return "unexpectedBeforeEqual"
+  case \AssignmentExprSyntax.equal:
+    return "equal"
+  case \AssignmentExprSyntax.unexpectedAfterEqual:
+    return "unexpectedAfterEqual"
   case \AssociatedtypeDeclSyntax.unexpectedBeforeAttributes:
     return "unexpectedBeforeAttributes"
   case \AssociatedtypeDeclSyntax.attributes:
@@ -249,12 +249,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "genericWhereClause"
   case \AssociatedtypeDeclSyntax.unexpectedAfterGenericWhereClause:
     return "unexpectedAfterGenericWhereClause"
-  case \AttributeSyntax.unexpectedBeforeAtSignToken:
-    return "unexpectedBeforeAtSignToken"
-  case \AttributeSyntax.atSignToken:
-    return "atSignToken"
-  case \AttributeSyntax.unexpectedBetweenAtSignTokenAndAttributeName:
-    return "unexpectedBetweenAtSignTokenAndAttributeName"
+  case \AttributeSyntax.unexpectedBeforeAtSign:
+    return "unexpectedBeforeAtSign"
+  case \AttributeSyntax.atSign:
+    return "atSign"
+  case \AttributeSyntax.unexpectedBetweenAtSignAndAttributeName:
+    return "unexpectedBetweenAtSignAndAttributeName"
   case \AttributeSyntax.attributeName:
     return "attributeName"
   case \AttributeSyntax.unexpectedBetweenAttributeNameAndLeftParen:
@@ -313,12 +313,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "rightParen"
   case \AvailabilityConditionSyntax.unexpectedAfterRightParen:
     return "unexpectedAfterRightParen"
-  case \AvailabilityEntrySyntax.unexpectedBeforeLabel:
-    return "unexpectedBeforeLabel"
-  case \AvailabilityEntrySyntax.label:
-    return "label"
-  case \AvailabilityEntrySyntax.unexpectedBetweenLabelAndColon:
-    return "unexpectedBetweenLabelAndColon"
+  case \AvailabilityEntrySyntax.unexpectedBeforeAvailabilityLabel:
+    return "unexpectedBeforeAvailabilityLabel"
+  case \AvailabilityEntrySyntax.availabilityLabel:
+    return "availabilityLabel"
+  case \AvailabilityEntrySyntax.unexpectedBetweenAvailabilityLabelAndColon:
+    return "unexpectedBetweenAvailabilityLabelAndColon"
   case \AvailabilityEntrySyntax.colon:
     return "colon"
   case \AvailabilityEntrySyntax.unexpectedBetweenColonAndAvailabilityArguments:
@@ -389,12 +389,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "platforms"
   case \BackDeployedAttributeSpecListSyntax.unexpectedAfterPlatforms:
     return "unexpectedAfterPlatforms"
-  case \BinaryOperatorExprSyntax.unexpectedBeforeOperatorToken:
-    return "unexpectedBeforeOperatorToken"
-  case \BinaryOperatorExprSyntax.operatorToken:
-    return "operatorToken"
-  case \BinaryOperatorExprSyntax.unexpectedAfterOperatorToken:
-    return "unexpectedAfterOperatorToken"
+  case \BinaryOperatorExprSyntax.unexpectedBeforeOperator:
+    return "unexpectedBeforeOperator"
+  case \BinaryOperatorExprSyntax.operator:
+    return "operator"
+  case \BinaryOperatorExprSyntax.unexpectedAfterOperator:
+    return "unexpectedAfterOperator"
   case \BooleanLiteralExprSyntax.unexpectedBeforeBooleanLiteral:
     return "unexpectedBeforeBooleanLiteral"
   case \BooleanLiteralExprSyntax.booleanLiteral:
@@ -569,12 +569,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "unexpectedBetweenSpecifierAndName"
   case \ClosureCaptureItemSyntax.name:
     return "name"
-  case \ClosureCaptureItemSyntax.unexpectedBetweenNameAndAssignToken:
-    return "unexpectedBetweenNameAndAssignToken"
-  case \ClosureCaptureItemSyntax.assignToken:
-    return "assignToken"
-  case \ClosureCaptureItemSyntax.unexpectedBetweenAssignTokenAndExpression:
-    return "unexpectedBetweenAssignTokenAndExpression"
+  case \ClosureCaptureItemSyntax.unexpectedBetweenNameAndEqual:
+    return "unexpectedBetweenNameAndEqual"
+  case \ClosureCaptureItemSyntax.equal:
+    return "equal"
+  case \ClosureCaptureItemSyntax.unexpectedBetweenEqualAndExpression:
+    return "unexpectedBetweenEqualAndExpression"
   case \ClosureCaptureItemSyntax.expression:
     return "expression"
   case \ClosureCaptureItemSyntax.unexpectedBetweenExpressionAndTrailingComma:
@@ -693,12 +693,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "unexpectedBetweenEffectSpecifiersAndOutput"
   case \ClosureSignatureSyntax.output:
     return "output"
-  case \ClosureSignatureSyntax.unexpectedBetweenOutputAndInTok:
-    return "unexpectedBetweenOutputAndInTok"
-  case \ClosureSignatureSyntax.inTok:
-    return "inTok"
-  case \ClosureSignatureSyntax.unexpectedAfterInTok:
-    return "unexpectedAfterInTok"
+  case \ClosureSignatureSyntax.unexpectedBetweenOutputAndInKeyword:
+    return "unexpectedBetweenOutputAndInKeyword"
+  case \ClosureSignatureSyntax.inKeyword:
+    return "inKeyword"
+  case \ClosureSignatureSyntax.unexpectedAfterInKeyword:
+    return "unexpectedAfterInKeyword"
   case \CodeBlockItemSyntax.unexpectedBeforeItem:
     return "unexpectedBeforeItem"
   case \CodeBlockItemSyntax.item:
@@ -1299,12 +1299,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "unexpectedBeforeBackslash"
   case \ExpressionSegmentSyntax.backslash:
     return "backslash"
-  case \ExpressionSegmentSyntax.unexpectedBetweenBackslashAndDelimiter:
-    return "unexpectedBetweenBackslashAndDelimiter"
-  case \ExpressionSegmentSyntax.delimiter:
-    return "delimiter"
-  case \ExpressionSegmentSyntax.unexpectedBetweenDelimiterAndLeftParen:
-    return "unexpectedBetweenDelimiterAndLeftParen"
+  case \ExpressionSegmentSyntax.unexpectedBetweenBackslashAndRawStringDelimiter:
+    return "unexpectedBetweenBackslashAndRawStringDelimiter"
+  case \ExpressionSegmentSyntax.rawStringDelimiter:
+    return "rawStringDelimiter"
+  case \ExpressionSegmentSyntax.unexpectedBetweenRawStringDelimiterAndLeftParen:
+    return "unexpectedBetweenRawStringDelimiterAndLeftParen"
   case \ExpressionSegmentSyntax.leftParen:
     return "leftParen"
   case \ExpressionSegmentSyntax.unexpectedBetweenLeftParenAndExpressions:
@@ -1359,12 +1359,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "fallthroughKeyword"
   case \FallthroughStmtSyntax.unexpectedAfterFallthroughKeyword:
     return "unexpectedAfterFallthroughKeyword"
-  case \FloatLiteralExprSyntax.unexpectedBeforeFloatingDigits:
-    return "unexpectedBeforeFloatingDigits"
-  case \FloatLiteralExprSyntax.floatingDigits:
-    return "floatingDigits"
-  case \FloatLiteralExprSyntax.unexpectedAfterFloatingDigits:
-    return "unexpectedAfterFloatingDigits"
+  case \FloatLiteralExprSyntax.unexpectedBeforeDigits:
+    return "unexpectedBeforeDigits"
+  case \FloatLiteralExprSyntax.digits:
+    return "digits"
+  case \FloatLiteralExprSyntax.unexpectedAfterDigits:
+    return "unexpectedAfterDigits"
   case \ForInStmtSyntax.unexpectedBeforeForKeyword:
     return "unexpectedBeforeForKeyword"
   case \ForInStmtSyntax.forKeyword:
@@ -1561,20 +1561,20 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "output"
   case \FunctionTypeSyntax.unexpectedAfterOutput:
     return "unexpectedAfterOutput"
-  case \GenericArgumentClauseSyntax.unexpectedBeforeLeftAngleBracket:
-    return "unexpectedBeforeLeftAngleBracket"
-  case \GenericArgumentClauseSyntax.leftAngleBracket:
-    return "leftAngleBracket"
-  case \GenericArgumentClauseSyntax.unexpectedBetweenLeftAngleBracketAndArguments:
-    return "unexpectedBetweenLeftAngleBracketAndArguments"
+  case \GenericArgumentClauseSyntax.unexpectedBeforeLeftAngle:
+    return "unexpectedBeforeLeftAngle"
+  case \GenericArgumentClauseSyntax.leftAngle:
+    return "leftAngle"
+  case \GenericArgumentClauseSyntax.unexpectedBetweenLeftAngleAndArguments:
+    return "unexpectedBetweenLeftAngleAndArguments"
   case \GenericArgumentClauseSyntax.arguments:
     return "arguments"
-  case \GenericArgumentClauseSyntax.unexpectedBetweenArgumentsAndRightAngleBracket:
-    return "unexpectedBetweenArgumentsAndRightAngleBracket"
-  case \GenericArgumentClauseSyntax.rightAngleBracket:
-    return "rightAngleBracket"
-  case \GenericArgumentClauseSyntax.unexpectedAfterRightAngleBracket:
-    return "unexpectedAfterRightAngleBracket"
+  case \GenericArgumentClauseSyntax.unexpectedBetweenArgumentsAndRightAngle:
+    return "unexpectedBetweenArgumentsAndRightAngle"
+  case \GenericArgumentClauseSyntax.rightAngle:
+    return "rightAngle"
+  case \GenericArgumentClauseSyntax.unexpectedAfterRightAngle:
+    return "unexpectedAfterRightAngle"
   case \GenericArgumentSyntax.unexpectedBeforeArgumentType:
     return "unexpectedBeforeArgumentType"
   case \GenericArgumentSyntax.argumentType:
@@ -1585,34 +1585,34 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "trailingComma"
   case \GenericArgumentSyntax.unexpectedAfterTrailingComma:
     return "unexpectedAfterTrailingComma"
-  case \GenericParameterClauseSyntax.unexpectedBeforeLeftAngleBracket:
-    return "unexpectedBeforeLeftAngleBracket"
-  case \GenericParameterClauseSyntax.leftAngleBracket:
-    return "leftAngleBracket"
-  case \GenericParameterClauseSyntax.unexpectedBetweenLeftAngleBracketAndParameters:
-    return "unexpectedBetweenLeftAngleBracketAndParameters"
+  case \GenericParameterClauseSyntax.unexpectedBeforeLeftAngle:
+    return "unexpectedBeforeLeftAngle"
+  case \GenericParameterClauseSyntax.leftAngle:
+    return "leftAngle"
+  case \GenericParameterClauseSyntax.unexpectedBetweenLeftAngleAndParameters:
+    return "unexpectedBetweenLeftAngleAndParameters"
   case \GenericParameterClauseSyntax.parameters:
     return "parameters"
   case \GenericParameterClauseSyntax.unexpectedBetweenParametersAndGenericWhereClause:
     return "unexpectedBetweenParametersAndGenericWhereClause"
   case \GenericParameterClauseSyntax.genericWhereClause:
     return "genericWhereClause"
-  case \GenericParameterClauseSyntax.unexpectedBetweenGenericWhereClauseAndRightAngleBracket:
-    return "unexpectedBetweenGenericWhereClauseAndRightAngleBracket"
-  case \GenericParameterClauseSyntax.rightAngleBracket:
-    return "rightAngleBracket"
-  case \GenericParameterClauseSyntax.unexpectedAfterRightAngleBracket:
-    return "unexpectedAfterRightAngleBracket"
+  case \GenericParameterClauseSyntax.unexpectedBetweenGenericWhereClauseAndRightAngle:
+    return "unexpectedBetweenGenericWhereClauseAndRightAngle"
+  case \GenericParameterClauseSyntax.rightAngle:
+    return "rightAngle"
+  case \GenericParameterClauseSyntax.unexpectedAfterRightAngle:
+    return "unexpectedAfterRightAngle"
   case \GenericParameterSyntax.unexpectedBeforeAttributes:
     return "unexpectedBeforeAttributes"
   case \GenericParameterSyntax.attributes:
     return "attributes"
-  case \GenericParameterSyntax.unexpectedBetweenAttributesAndEach:
-    return "unexpectedBetweenAttributesAndEach"
-  case \GenericParameterSyntax.each:
-    return "each"
-  case \GenericParameterSyntax.unexpectedBetweenEachAndName:
-    return "unexpectedBetweenEachAndName"
+  case \GenericParameterSyntax.unexpectedBetweenAttributesAndEachKeyword:
+    return "unexpectedBetweenAttributesAndEachKeyword"
+  case \GenericParameterSyntax.eachKeyword:
+    return "eachKeyword"
+  case \GenericParameterSyntax.unexpectedBetweenEachKeywordAndName:
+    return "unexpectedBetweenEachKeywordAndName"
   case \GenericParameterSyntax.name:
     return "name"
   case \GenericParameterSyntax.unexpectedBetweenNameAndColon:
@@ -1783,12 +1783,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "unexpectedBeforeName"
   case \ImportPathComponentSyntax.name:
     return "name"
-  case \ImportPathComponentSyntax.unexpectedBetweenNameAndTrailingDot:
-    return "unexpectedBetweenNameAndTrailingDot"
-  case \ImportPathComponentSyntax.trailingDot:
-    return "trailingDot"
-  case \ImportPathComponentSyntax.unexpectedAfterTrailingDot:
-    return "unexpectedAfterTrailingDot"
+  case \ImportPathComponentSyntax.unexpectedBetweenNameAndTrailingPeriod:
+    return "unexpectedBetweenNameAndTrailingPeriod"
+  case \ImportPathComponentSyntax.trailingPeriod:
+    return "trailingPeriod"
+  case \ImportPathComponentSyntax.unexpectedAfterTrailingPeriod:
+    return "unexpectedAfterTrailingPeriod"
   case \InOutExprSyntax.unexpectedBeforeAmpersand:
     return "unexpectedBeforeAmpersand"
   case \InOutExprSyntax.ampersand:
@@ -1895,12 +1895,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "unexpectedBeforeExpression"
   case \IsExprSyntax.expression:
     return "expression"
-  case \IsExprSyntax.unexpectedBetweenExpressionAndIsTok:
-    return "unexpectedBetweenExpressionAndIsTok"
-  case \IsExprSyntax.isTok:
-    return "isTok"
-  case \IsExprSyntax.unexpectedBetweenIsTokAndTypeName:
-    return "unexpectedBetweenIsTokAndTypeName"
+  case \IsExprSyntax.unexpectedBetweenExpressionAndIsKeyword:
+    return "unexpectedBetweenExpressionAndIsKeyword"
+  case \IsExprSyntax.isKeyword:
+    return "isKeyword"
+  case \IsExprSyntax.unexpectedBetweenIsKeywordAndTypeName:
+    return "unexpectedBetweenIsKeywordAndTypeName"
   case \IsExprSyntax.typeName:
     return "typeName"
   case \IsExprSyntax.unexpectedAfterTypeName:
@@ -1959,20 +1959,20 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "genericArgumentClause"
   case \KeyPathPropertyComponentSyntax.unexpectedAfterGenericArgumentClause:
     return "unexpectedAfterGenericArgumentClause"
-  case \KeyPathSubscriptComponentSyntax.unexpectedBeforeLeftBracket:
-    return "unexpectedBeforeLeftBracket"
-  case \KeyPathSubscriptComponentSyntax.leftBracket:
-    return "leftBracket"
-  case \KeyPathSubscriptComponentSyntax.unexpectedBetweenLeftBracketAndArgumentList:
-    return "unexpectedBetweenLeftBracketAndArgumentList"
+  case \KeyPathSubscriptComponentSyntax.unexpectedBeforeLeftSquare:
+    return "unexpectedBeforeLeftSquare"
+  case \KeyPathSubscriptComponentSyntax.leftSquare:
+    return "leftSquare"
+  case \KeyPathSubscriptComponentSyntax.unexpectedBetweenLeftSquareAndArgumentList:
+    return "unexpectedBetweenLeftSquareAndArgumentList"
   case \KeyPathSubscriptComponentSyntax.argumentList:
     return "argumentList"
-  case \KeyPathSubscriptComponentSyntax.unexpectedBetweenArgumentListAndRightBracket:
-    return "unexpectedBetweenArgumentListAndRightBracket"
-  case \KeyPathSubscriptComponentSyntax.rightBracket:
-    return "rightBracket"
-  case \KeyPathSubscriptComponentSyntax.unexpectedAfterRightBracket:
-    return "unexpectedAfterRightBracket"
+  case \KeyPathSubscriptComponentSyntax.unexpectedBetweenArgumentListAndRightSquare:
+    return "unexpectedBetweenArgumentListAndRightSquare"
+  case \KeyPathSubscriptComponentSyntax.rightSquare:
+    return "rightSquare"
+  case \KeyPathSubscriptComponentSyntax.unexpectedAfterRightSquare:
+    return "unexpectedAfterRightSquare"
   case \LabeledSpecializeEntrySyntax.unexpectedBeforeLabel:
     return "unexpectedBeforeLabel"
   case \LabeledSpecializeEntrySyntax.label:
@@ -1991,16 +1991,16 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "trailingComma"
   case \LabeledSpecializeEntrySyntax.unexpectedAfterTrailingComma:
     return "unexpectedAfterTrailingComma"
-  case \LabeledStmtSyntax.unexpectedBeforeLabelName:
-    return "unexpectedBeforeLabelName"
-  case \LabeledStmtSyntax.labelName:
-    return "labelName"
-  case \LabeledStmtSyntax.unexpectedBetweenLabelNameAndLabelColon:
-    return "unexpectedBetweenLabelNameAndLabelColon"
-  case \LabeledStmtSyntax.labelColon:
-    return "labelColon"
-  case \LabeledStmtSyntax.unexpectedBetweenLabelColonAndStatement:
-    return "unexpectedBetweenLabelColonAndStatement"
+  case \LabeledStmtSyntax.unexpectedBeforeLabel:
+    return "unexpectedBeforeLabel"
+  case \LabeledStmtSyntax.label:
+    return "label"
+  case \LabeledStmtSyntax.unexpectedBetweenLabelAndColon:
+    return "unexpectedBetweenLabelAndColon"
+  case \LabeledStmtSyntax.colon:
+    return "colon"
+  case \LabeledStmtSyntax.unexpectedBetweenColonAndStatement:
+    return "unexpectedBetweenColonAndStatement"
   case \LabeledStmtSyntax.statement:
     return "statement"
   case \LabeledStmtSyntax.unexpectedAfterStatement:
@@ -2081,12 +2081,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "unexpectedBetweenAttributesAndModifiers"
   case \MacroExpansionDeclSyntax.modifiers:
     return "modifiers"
-  case \MacroExpansionDeclSyntax.unexpectedBetweenModifiersAndPoundToken:
-    return "unexpectedBetweenModifiersAndPoundToken"
-  case \MacroExpansionDeclSyntax.poundToken:
-    return "poundToken"
-  case \MacroExpansionDeclSyntax.unexpectedBetweenPoundTokenAndMacro:
-    return "unexpectedBetweenPoundTokenAndMacro"
+  case \MacroExpansionDeclSyntax.unexpectedBetweenModifiersAndPound:
+    return "unexpectedBetweenModifiersAndPound"
+  case \MacroExpansionDeclSyntax.pound:
+    return "pound"
+  case \MacroExpansionDeclSyntax.unexpectedBetweenPoundAndMacro:
+    return "unexpectedBetweenPoundAndMacro"
   case \MacroExpansionDeclSyntax.macro:
     return "macro"
   case \MacroExpansionDeclSyntax.unexpectedBetweenMacroAndGenericArguments:
@@ -2115,12 +2115,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "additionalTrailingClosures"
   case \MacroExpansionDeclSyntax.unexpectedAfterAdditionalTrailingClosures:
     return "unexpectedAfterAdditionalTrailingClosures"
-  case \MacroExpansionExprSyntax.unexpectedBeforePoundToken:
-    return "unexpectedBeforePoundToken"
-  case \MacroExpansionExprSyntax.poundToken:
-    return "poundToken"
-  case \MacroExpansionExprSyntax.unexpectedBetweenPoundTokenAndMacro:
-    return "unexpectedBetweenPoundTokenAndMacro"
+  case \MacroExpansionExprSyntax.unexpectedBeforePound:
+    return "unexpectedBeforePound"
+  case \MacroExpansionExprSyntax.pound:
+    return "pound"
+  case \MacroExpansionExprSyntax.unexpectedBetweenPoundAndMacro:
+    return "unexpectedBetweenPoundAndMacro"
   case \MacroExpansionExprSyntax.macro:
     return "macro"
   case \MacroExpansionExprSyntax.unexpectedBetweenMacroAndGenericArguments:
@@ -2171,12 +2171,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "unexpectedBeforeBase"
   case \MemberAccessExprSyntax.base:
     return "base"
-  case \MemberAccessExprSyntax.unexpectedBetweenBaseAndDot:
-    return "unexpectedBetweenBaseAndDot"
-  case \MemberAccessExprSyntax.dot:
-    return "dot"
-  case \MemberAccessExprSyntax.unexpectedBetweenDotAndName:
-    return "unexpectedBetweenDotAndName"
+  case \MemberAccessExprSyntax.unexpectedBetweenBaseAndPeriod:
+    return "unexpectedBetweenBaseAndPeriod"
+  case \MemberAccessExprSyntax.period:
+    return "period"
+  case \MemberAccessExprSyntax.unexpectedBetweenPeriodAndName:
+    return "unexpectedBetweenPeriodAndName"
   case \MemberAccessExprSyntax.name:
     return "name"
   case \MemberAccessExprSyntax.unexpectedBetweenNameAndDeclNameArguments:
@@ -2531,38 +2531,38 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "unexpectedBeforeExpression"
   case \PostfixUnaryExprSyntax.expression:
     return "expression"
-  case \PostfixUnaryExprSyntax.unexpectedBetweenExpressionAndOperatorToken:
-    return "unexpectedBetweenExpressionAndOperatorToken"
-  case \PostfixUnaryExprSyntax.operatorToken:
-    return "operatorToken"
-  case \PostfixUnaryExprSyntax.unexpectedAfterOperatorToken:
-    return "unexpectedAfterOperatorToken"
-  case \PoundSourceLocationArgsSyntax.unexpectedBeforeFileArgLabel:
-    return "unexpectedBeforeFileArgLabel"
-  case \PoundSourceLocationArgsSyntax.fileArgLabel:
-    return "fileArgLabel"
-  case \PoundSourceLocationArgsSyntax.unexpectedBetweenFileArgLabelAndFileArgColon:
-    return "unexpectedBetweenFileArgLabelAndFileArgColon"
-  case \PoundSourceLocationArgsSyntax.fileArgColon:
-    return "fileArgColon"
-  case \PoundSourceLocationArgsSyntax.unexpectedBetweenFileArgColonAndFileName:
-    return "unexpectedBetweenFileArgColonAndFileName"
+  case \PostfixUnaryExprSyntax.unexpectedBetweenExpressionAndOperator:
+    return "unexpectedBetweenExpressionAndOperator"
+  case \PostfixUnaryExprSyntax.operator:
+    return "operator"
+  case \PostfixUnaryExprSyntax.unexpectedAfterOperator:
+    return "unexpectedAfterOperator"
+  case \PoundSourceLocationArgsSyntax.unexpectedBeforeFileLabel:
+    return "unexpectedBeforeFileLabel"
+  case \PoundSourceLocationArgsSyntax.fileLabel:
+    return "fileLabel"
+  case \PoundSourceLocationArgsSyntax.unexpectedBetweenFileLabelAndFileColon:
+    return "unexpectedBetweenFileLabelAndFileColon"
+  case \PoundSourceLocationArgsSyntax.fileColon:
+    return "fileColon"
+  case \PoundSourceLocationArgsSyntax.unexpectedBetweenFileColonAndFileName:
+    return "unexpectedBetweenFileColonAndFileName"
   case \PoundSourceLocationArgsSyntax.fileName:
     return "fileName"
   case \PoundSourceLocationArgsSyntax.unexpectedBetweenFileNameAndComma:
     return "unexpectedBetweenFileNameAndComma"
   case \PoundSourceLocationArgsSyntax.comma:
     return "comma"
-  case \PoundSourceLocationArgsSyntax.unexpectedBetweenCommaAndLineArgLabel:
-    return "unexpectedBetweenCommaAndLineArgLabel"
-  case \PoundSourceLocationArgsSyntax.lineArgLabel:
-    return "lineArgLabel"
-  case \PoundSourceLocationArgsSyntax.unexpectedBetweenLineArgLabelAndLineArgColon:
-    return "unexpectedBetweenLineArgLabelAndLineArgColon"
-  case \PoundSourceLocationArgsSyntax.lineArgColon:
-    return "lineArgColon"
-  case \PoundSourceLocationArgsSyntax.unexpectedBetweenLineArgColonAndLineNumber:
-    return "unexpectedBetweenLineArgColonAndLineNumber"
+  case \PoundSourceLocationArgsSyntax.unexpectedBetweenCommaAndLineLabel:
+    return "unexpectedBetweenCommaAndLineLabel"
+  case \PoundSourceLocationArgsSyntax.lineLabel:
+    return "lineLabel"
+  case \PoundSourceLocationArgsSyntax.unexpectedBetweenLineLabelAndLineColon:
+    return "unexpectedBetweenLineLabelAndLineColon"
+  case \PoundSourceLocationArgsSyntax.lineColon:
+    return "lineColon"
+  case \PoundSourceLocationArgsSyntax.unexpectedBetweenLineColonAndLineNumber:
+    return "unexpectedBetweenLineColonAndLineNumber"
   case \PoundSourceLocationArgsSyntax.lineNumber:
     return "lineNumber"
   case \PoundSourceLocationArgsSyntax.unexpectedAfterLineNumber:
@@ -2585,12 +2585,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "rightParen"
   case \PoundSourceLocationSyntax.unexpectedAfterRightParen:
     return "unexpectedAfterRightParen"
-  case \PrecedenceGroupAssignmentSyntax.unexpectedBeforeAssignmentKeyword:
-    return "unexpectedBeforeAssignmentKeyword"
-  case \PrecedenceGroupAssignmentSyntax.assignmentKeyword:
-    return "assignmentKeyword"
-  case \PrecedenceGroupAssignmentSyntax.unexpectedBetweenAssignmentKeywordAndColon:
-    return "unexpectedBetweenAssignmentKeywordAndColon"
+  case \PrecedenceGroupAssignmentSyntax.unexpectedBeforeAssignmentLabel:
+    return "unexpectedBeforeAssignmentLabel"
+  case \PrecedenceGroupAssignmentSyntax.assignmentLabel:
+    return "assignmentLabel"
+  case \PrecedenceGroupAssignmentSyntax.unexpectedBetweenAssignmentLabelAndColon:
+    return "unexpectedBetweenAssignmentLabelAndColon"
   case \PrecedenceGroupAssignmentSyntax.colon:
     return "colon"
   case \PrecedenceGroupAssignmentSyntax.unexpectedBetweenColonAndFlag:
@@ -2599,12 +2599,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "flag"
   case \PrecedenceGroupAssignmentSyntax.unexpectedAfterFlag:
     return "unexpectedAfterFlag"
-  case \PrecedenceGroupAssociativitySyntax.unexpectedBeforeAssociativityKeyword:
-    return "unexpectedBeforeAssociativityKeyword"
-  case \PrecedenceGroupAssociativitySyntax.associativityKeyword:
-    return "associativityKeyword"
-  case \PrecedenceGroupAssociativitySyntax.unexpectedBetweenAssociativityKeywordAndColon:
-    return "unexpectedBetweenAssociativityKeywordAndColon"
+  case \PrecedenceGroupAssociativitySyntax.unexpectedBeforeAssociativityLabel:
+    return "unexpectedBeforeAssociativityLabel"
+  case \PrecedenceGroupAssociativitySyntax.associativityLabel:
+    return "associativityLabel"
+  case \PrecedenceGroupAssociativitySyntax.unexpectedBetweenAssociativityLabelAndColon:
+    return "unexpectedBetweenAssociativityLabelAndColon"
   case \PrecedenceGroupAssociativitySyntax.colon:
     return "colon"
   case \PrecedenceGroupAssociativitySyntax.unexpectedBetweenColonAndValue:
@@ -2667,30 +2667,30 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "otherNames"
   case \PrecedenceGroupRelationSyntax.unexpectedAfterOtherNames:
     return "unexpectedAfterOtherNames"
-  case \PrefixOperatorExprSyntax.unexpectedBeforeOperatorToken:
-    return "unexpectedBeforeOperatorToken"
-  case \PrefixOperatorExprSyntax.operatorToken:
-    return "operatorToken"
-  case \PrefixOperatorExprSyntax.unexpectedBetweenOperatorTokenAndPostfixExpression:
-    return "unexpectedBetweenOperatorTokenAndPostfixExpression"
+  case \PrefixOperatorExprSyntax.unexpectedBeforeOperator:
+    return "unexpectedBeforeOperator"
+  case \PrefixOperatorExprSyntax.operator:
+    return "operator"
+  case \PrefixOperatorExprSyntax.unexpectedBetweenOperatorAndPostfixExpression:
+    return "unexpectedBetweenOperatorAndPostfixExpression"
   case \PrefixOperatorExprSyntax.postfixExpression:
     return "postfixExpression"
   case \PrefixOperatorExprSyntax.unexpectedAfterPostfixExpression:
     return "unexpectedAfterPostfixExpression"
-  case \PrimaryAssociatedTypeClauseSyntax.unexpectedBeforeLeftAngleBracket:
-    return "unexpectedBeforeLeftAngleBracket"
-  case \PrimaryAssociatedTypeClauseSyntax.leftAngleBracket:
-    return "leftAngleBracket"
-  case \PrimaryAssociatedTypeClauseSyntax.unexpectedBetweenLeftAngleBracketAndPrimaryAssociatedTypeList:
-    return "unexpectedBetweenLeftAngleBracketAndPrimaryAssociatedTypeList"
+  case \PrimaryAssociatedTypeClauseSyntax.unexpectedBeforeLeftAngle:
+    return "unexpectedBeforeLeftAngle"
+  case \PrimaryAssociatedTypeClauseSyntax.leftAngle:
+    return "leftAngle"
+  case \PrimaryAssociatedTypeClauseSyntax.unexpectedBetweenLeftAngleAndPrimaryAssociatedTypeList:
+    return "unexpectedBetweenLeftAngleAndPrimaryAssociatedTypeList"
   case \PrimaryAssociatedTypeClauseSyntax.primaryAssociatedTypeList:
     return "primaryAssociatedTypeList"
-  case \PrimaryAssociatedTypeClauseSyntax.unexpectedBetweenPrimaryAssociatedTypeListAndRightAngleBracket:
-    return "unexpectedBetweenPrimaryAssociatedTypeListAndRightAngleBracket"
-  case \PrimaryAssociatedTypeClauseSyntax.rightAngleBracket:
-    return "rightAngleBracket"
-  case \PrimaryAssociatedTypeClauseSyntax.unexpectedAfterRightAngleBracket:
-    return "unexpectedAfterRightAngleBracket"
+  case \PrimaryAssociatedTypeClauseSyntax.unexpectedBetweenPrimaryAssociatedTypeListAndRightAngle:
+    return "unexpectedBetweenPrimaryAssociatedTypeListAndRightAngle"
+  case \PrimaryAssociatedTypeClauseSyntax.rightAngle:
+    return "rightAngle"
+  case \PrimaryAssociatedTypeClauseSyntax.unexpectedAfterRightAngle:
+    return "unexpectedAfterRightAngle"
   case \PrimaryAssociatedTypeSyntax.unexpectedBeforeName:
     return "unexpectedBeforeName"
   case \PrimaryAssociatedTypeSyntax.name:
@@ -2739,12 +2739,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "unexpectedBeforeBaseType"
   case \QualifiedDeclNameSyntax.baseType:
     return "baseType"
-  case \QualifiedDeclNameSyntax.unexpectedBetweenBaseTypeAndDot:
-    return "unexpectedBetweenBaseTypeAndDot"
-  case \QualifiedDeclNameSyntax.dot:
-    return "dot"
-  case \QualifiedDeclNameSyntax.unexpectedBetweenDotAndName:
-    return "unexpectedBetweenDotAndName"
+  case \QualifiedDeclNameSyntax.unexpectedBetweenBaseTypeAndPeriod:
+    return "unexpectedBetweenBaseTypeAndPeriod"
+  case \QualifiedDeclNameSyntax.period:
+    return "period"
+  case \QualifiedDeclNameSyntax.unexpectedBetweenPeriodAndName:
+    return "unexpectedBetweenPeriodAndName"
   case \QualifiedDeclNameSyntax.name:
     return "name"
   case \QualifiedDeclNameSyntax.unexpectedBetweenNameAndArguments:
@@ -2847,12 +2847,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "unexpectedBeforeStatements"
   case \SourceFileSyntax.statements:
     return "statements"
-  case \SourceFileSyntax.unexpectedBetweenStatementsAndEOFToken:
-    return "unexpectedBetweenStatementsAndEOFToken"
-  case \SourceFileSyntax.eofToken:
-    return "eofToken"
-  case \SourceFileSyntax.unexpectedAfterEOFToken:
-    return "unexpectedAfterEOFToken"
+  case \SourceFileSyntax.unexpectedBetweenStatementsAndEndOfFileToken:
+    return "unexpectedBetweenStatementsAndEndOfFileToken"
+  case \SourceFileSyntax.endOfFileToken:
+    return "endOfFileToken"
+  case \SourceFileSyntax.unexpectedAfterEndOfFileToken:
+    return "unexpectedAfterEndOfFileToken"
   case \SpecializeExprSyntax.unexpectedBeforeExpression:
     return "unexpectedBeforeExpression"
   case \SpecializeExprSyntax.expression:
@@ -2963,20 +2963,20 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "unexpectedBeforeCalledExpression"
   case \SubscriptExprSyntax.calledExpression:
     return "calledExpression"
-  case \SubscriptExprSyntax.unexpectedBetweenCalledExpressionAndLeftBracket:
-    return "unexpectedBetweenCalledExpressionAndLeftBracket"
-  case \SubscriptExprSyntax.leftBracket:
-    return "leftBracket"
-  case \SubscriptExprSyntax.unexpectedBetweenLeftBracketAndArgumentList:
-    return "unexpectedBetweenLeftBracketAndArgumentList"
+  case \SubscriptExprSyntax.unexpectedBetweenCalledExpressionAndLeftSquare:
+    return "unexpectedBetweenCalledExpressionAndLeftSquare"
+  case \SubscriptExprSyntax.leftSquare:
+    return "leftSquare"
+  case \SubscriptExprSyntax.unexpectedBetweenLeftSquareAndArgumentList:
+    return "unexpectedBetweenLeftSquareAndArgumentList"
   case \SubscriptExprSyntax.argumentList:
     return "argumentList"
-  case \SubscriptExprSyntax.unexpectedBetweenArgumentListAndRightBracket:
-    return "unexpectedBetweenArgumentListAndRightBracket"
-  case \SubscriptExprSyntax.rightBracket:
-    return "rightBracket"
-  case \SubscriptExprSyntax.unexpectedBetweenRightBracketAndTrailingClosure:
-    return "unexpectedBetweenRightBracketAndTrailingClosure"
+  case \SubscriptExprSyntax.unexpectedBetweenArgumentListAndRightSquare:
+    return "unexpectedBetweenArgumentListAndRightSquare"
+  case \SubscriptExprSyntax.rightSquare:
+    return "rightSquare"
+  case \SubscriptExprSyntax.unexpectedBetweenRightSquareAndTrailingClosure:
+    return "unexpectedBetweenRightSquareAndTrailingClosure"
   case \SubscriptExprSyntax.trailingClosure:
     return "trailingClosure"
   case \SubscriptExprSyntax.unexpectedBetweenTrailingClosureAndAdditionalTrailingClosures:
@@ -3061,12 +3061,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "rightBrace"
   case \SwitchExprSyntax.unexpectedAfterRightBrace:
     return "unexpectedAfterRightBrace"
-  case \TargetFunctionEntrySyntax.unexpectedBeforeLabel:
-    return "unexpectedBeforeLabel"
-  case \TargetFunctionEntrySyntax.label:
-    return "label"
-  case \TargetFunctionEntrySyntax.unexpectedBetweenLabelAndColon:
-    return "unexpectedBetweenLabelAndColon"
+  case \TargetFunctionEntrySyntax.unexpectedBeforeTargetLabel:
+    return "unexpectedBeforeTargetLabel"
+  case \TargetFunctionEntrySyntax.targetLabel:
+    return "targetLabel"
+  case \TargetFunctionEntrySyntax.unexpectedBetweenTargetLabelAndColon:
+    return "unexpectedBetweenTargetLabelAndColon"
   case \TargetFunctionEntrySyntax.colon:
     return "colon"
   case \TargetFunctionEntrySyntax.unexpectedBetweenColonAndDeclname:
@@ -3091,12 +3091,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "unexpectedBetweenQuestionMarkAndFirstChoice"
   case \TernaryExprSyntax.firstChoice:
     return "firstChoice"
-  case \TernaryExprSyntax.unexpectedBetweenFirstChoiceAndColonMark:
-    return "unexpectedBetweenFirstChoiceAndColonMark"
-  case \TernaryExprSyntax.colonMark:
-    return "colonMark"
-  case \TernaryExprSyntax.unexpectedBetweenColonMarkAndSecondChoice:
-    return "unexpectedBetweenColonMarkAndSecondChoice"
+  case \TernaryExprSyntax.unexpectedBetweenFirstChoiceAndColon:
+    return "unexpectedBetweenFirstChoiceAndColon"
+  case \TernaryExprSyntax.colon:
+    return "colon"
+  case \TernaryExprSyntax.unexpectedBetweenColonAndSecondChoice:
+    return "unexpectedBetweenColonAndSecondChoice"
   case \TernaryExprSyntax.secondChoice:
     return "secondChoice"
   case \TernaryExprSyntax.unexpectedAfterSecondChoice:
@@ -3157,16 +3157,16 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "rightParen"
   case \TupleExprSyntax.unexpectedAfterRightParen:
     return "unexpectedAfterRightParen"
-  case \TuplePatternElementSyntax.unexpectedBeforeLabelName:
-    return "unexpectedBeforeLabelName"
-  case \TuplePatternElementSyntax.labelName:
-    return "labelName"
-  case \TuplePatternElementSyntax.unexpectedBetweenLabelNameAndLabelColon:
-    return "unexpectedBetweenLabelNameAndLabelColon"
-  case \TuplePatternElementSyntax.labelColon:
-    return "labelColon"
-  case \TuplePatternElementSyntax.unexpectedBetweenLabelColonAndPattern:
-    return "unexpectedBetweenLabelColonAndPattern"
+  case \TuplePatternElementSyntax.unexpectedBeforeLabel:
+    return "unexpectedBeforeLabel"
+  case \TuplePatternElementSyntax.label:
+    return "label"
+  case \TuplePatternElementSyntax.unexpectedBetweenLabelAndColon:
+    return "unexpectedBetweenLabelAndColon"
+  case \TuplePatternElementSyntax.colon:
+    return "colon"
+  case \TuplePatternElementSyntax.unexpectedBetweenColonAndPattern:
+    return "unexpectedBetweenColonAndPattern"
   case \TuplePatternElementSyntax.pattern:
     return "pattern"
   case \TuplePatternElementSyntax.unexpectedBetweenPatternAndTrailingComma:
@@ -3189,12 +3189,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "rightParen"
   case \TuplePatternSyntax.unexpectedAfterRightParen:
     return "unexpectedAfterRightParen"
-  case \TupleTypeElementSyntax.unexpectedBeforeInOut:
-    return "unexpectedBeforeInOut"
-  case \TupleTypeElementSyntax.inOut:
-    return "inOut"
-  case \TupleTypeElementSyntax.unexpectedBetweenInOutAndName:
-    return "unexpectedBetweenInOutAndName"
+  case \TupleTypeElementSyntax.unexpectedBeforeInoutKeyword:
+    return "unexpectedBeforeInoutKeyword"
+  case \TupleTypeElementSyntax.inoutKeyword:
+    return "inoutKeyword"
+  case \TupleTypeElementSyntax.unexpectedBetweenInoutKeywordAndName:
+    return "unexpectedBetweenInoutKeywordAndName"
   case \TupleTypeElementSyntax.name:
     return "name"
   case \TupleTypeElementSyntax.unexpectedBetweenNameAndSecondName:
@@ -3341,22 +3341,22 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "filename"
   case \UnderscorePrivateAttributeArgumentsSyntax.unexpectedAfterFilename:
     return "unexpectedAfterFilename"
-  case \UnresolvedAsExprSyntax.unexpectedBeforeAsTok:
-    return "unexpectedBeforeAsTok"
-  case \UnresolvedAsExprSyntax.asTok:
-    return "asTok"
-  case \UnresolvedAsExprSyntax.unexpectedBetweenAsTokAndQuestionOrExclamationMark:
-    return "unexpectedBetweenAsTokAndQuestionOrExclamationMark"
+  case \UnresolvedAsExprSyntax.unexpectedBeforeAsKeyword:
+    return "unexpectedBeforeAsKeyword"
+  case \UnresolvedAsExprSyntax.asKeyword:
+    return "asKeyword"
+  case \UnresolvedAsExprSyntax.unexpectedBetweenAsKeywordAndQuestionOrExclamationMark:
+    return "unexpectedBetweenAsKeywordAndQuestionOrExclamationMark"
   case \UnresolvedAsExprSyntax.questionOrExclamationMark:
     return "questionOrExclamationMark"
   case \UnresolvedAsExprSyntax.unexpectedAfterQuestionOrExclamationMark:
     return "unexpectedAfterQuestionOrExclamationMark"
-  case \UnresolvedIsExprSyntax.unexpectedBeforeIsTok:
-    return "unexpectedBeforeIsTok"
-  case \UnresolvedIsExprSyntax.isTok:
-    return "isTok"
-  case \UnresolvedIsExprSyntax.unexpectedAfterIsTok:
-    return "unexpectedAfterIsTok"
+  case \UnresolvedIsExprSyntax.unexpectedBeforeIsKeyword:
+    return "unexpectedBeforeIsKeyword"
+  case \UnresolvedIsExprSyntax.isKeyword:
+    return "isKeyword"
+  case \UnresolvedIsExprSyntax.unexpectedAfterIsKeyword:
+    return "unexpectedAfterIsKeyword"
   case \UnresolvedPatternExprSyntax.unexpectedBeforePattern:
     return "unexpectedBeforePattern"
   case \UnresolvedPatternExprSyntax.pattern:
@@ -3371,12 +3371,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "unexpectedBetweenQuestionMarkAndFirstChoice"
   case \UnresolvedTernaryExprSyntax.firstChoice:
     return "firstChoice"
-  case \UnresolvedTernaryExprSyntax.unexpectedBetweenFirstChoiceAndColonMark:
-    return "unexpectedBetweenFirstChoiceAndColonMark"
-  case \UnresolvedTernaryExprSyntax.colonMark:
-    return "colonMark"
-  case \UnresolvedTernaryExprSyntax.unexpectedAfterColonMark:
-    return "unexpectedAfterColonMark"
+  case \UnresolvedTernaryExprSyntax.unexpectedBetweenFirstChoiceAndColon:
+    return "unexpectedBetweenFirstChoiceAndColon"
+  case \UnresolvedTernaryExprSyntax.colon:
+    return "colon"
+  case \UnresolvedTernaryExprSyntax.unexpectedAfterColon:
+    return "unexpectedAfterColon"
   case \ValueBindingPatternSyntax.unexpectedBeforeBindingKeyword:
     return "unexpectedBeforeBindingKeyword"
   case \ValueBindingPatternSyntax.bindingKeyword:
diff --git a/Sources/SwiftSyntax/generated/RenamedChildrenCompatibility.swift b/Sources/SwiftSyntax/generated/RenamedChildrenCompatibility.swift
index 7bb05c14736..a0388d42fcb 100644
--- a/Sources/SwiftSyntax/generated/RenamedChildrenCompatibility.swift
+++ b/Sources/SwiftSyntax/generated/RenamedChildrenCompatibility.swift
@@ -73,7 +73,7 @@ extension ArrayExprSyntax {
     }
   }
   
-  @available(*, deprecated, message: "Use an initializer with leftSquareBracket, rightSquareBracket argument(s).")
+  @available(*, deprecated, message: "Use an initializer with leftSquare, rightSquare argument(s).")
   @_disfavoredOverload
   public init(
       leadingTrivia: Trivia? = nil,
@@ -162,7 +162,7 @@ extension ArrayTypeSyntax {
     }
   }
   
-  @available(*, deprecated, message: "Use an initializer with leftSquareBracket, rightSquareBracket argument(s).")
+  @available(*, deprecated, message: "Use an initializer with leftSquare, rightSquare argument(s).")
   @_disfavoredOverload
   public init(
       leadingTrivia: Trivia? = nil,
@@ -190,6 +190,242 @@ extension ArrayTypeSyntax {
   }
 }
 
+extension ArrowExprSyntax {
+  @available(*, deprecated, renamed: "unexpectedBetweenEffectSpecifiersAndArrow")
+  public var unexpectedBetweenEffectSpecifiersAndArrowToken: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenEffectSpecifiersAndArrow
+    }
+    set {
+      unexpectedBetweenEffectSpecifiersAndArrow = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "arrow")
+  public var arrowToken: TokenSyntax {
+    get {
+      return arrow
+    }
+    set {
+      arrow = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedAfterArrow")
+  public var unexpectedAfterArrowToken: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedAfterArrow
+    }
+    set {
+      unexpectedAfterArrow = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with arrow argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeEffectSpecifiers: UnexpectedNodesSyntax? = nil,
+      effectSpecifiers: TypeEffectSpecifiersSyntax? = nil,
+      _ unexpectedBetweenEffectSpecifiersAndArrowToken: UnexpectedNodesSyntax? = nil,
+      arrowToken: TokenSyntax = .arrowToken(),
+      _ unexpectedAfterArrowToken: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeEffectSpecifiers, 
+        effectSpecifiers: effectSpecifiers, 
+        unexpectedBetweenEffectSpecifiersAndArrowToken, 
+        arrow: arrowToken, 
+        unexpectedAfterArrowToken, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension AsExprSyntax {
+  @available(*, deprecated, renamed: "unexpectedBetweenExpressionAndAsKeyword")
+  public var unexpectedBetweenExpressionAndAsTok: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenExpressionAndAsKeyword
+    }
+    set {
+      unexpectedBetweenExpressionAndAsKeyword = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "asKeyword")
+  public var asTok: TokenSyntax {
+    get {
+      return asKeyword
+    }
+    set {
+      asKeyword = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenAsKeywordAndQuestionOrExclamationMark")
+  public var unexpectedBetweenAsTokAndQuestionOrExclamationMark: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenAsKeywordAndQuestionOrExclamationMark
+    }
+    set {
+      unexpectedBetweenAsKeywordAndQuestionOrExclamationMark = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with asKeyword argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeExpression: UnexpectedNodesSyntax? = nil,
+      expression: some ExprSyntaxProtocol,
+      _ unexpectedBetweenExpressionAndAsTok: UnexpectedNodesSyntax? = nil,
+      asTok: TokenSyntax = .keyword(.as),
+      _ unexpectedBetweenAsTokAndQuestionOrExclamationMark: UnexpectedNodesSyntax? = nil,
+      questionOrExclamationMark: TokenSyntax? = nil,
+      _ unexpectedBetweenQuestionOrExclamationMarkAndTypeName: UnexpectedNodesSyntax? = nil,
+      typeName: some TypeSyntaxProtocol,
+      _ unexpectedAfterTypeName: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeExpression, 
+        expression: expression, 
+        unexpectedBetweenExpressionAndAsTok, 
+        asKeyword: asTok, 
+        unexpectedBetweenAsTokAndQuestionOrExclamationMark, 
+        questionOrExclamationMark: questionOrExclamationMark, 
+        unexpectedBetweenQuestionOrExclamationMarkAndTypeName, 
+        typeName: typeName, 
+        unexpectedAfterTypeName, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension AssignmentExprSyntax {
+  @available(*, deprecated, renamed: "unexpectedBeforeEqual")
+  public var unexpectedBeforeAssignToken: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBeforeEqual
+    }
+    set {
+      unexpectedBeforeEqual = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "equal")
+  public var assignToken: TokenSyntax {
+    get {
+      return equal
+    }
+    set {
+      equal = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedAfterEqual")
+  public var unexpectedAfterAssignToken: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedAfterEqual
+    }
+    set {
+      unexpectedAfterEqual = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with equal argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeAssignToken: UnexpectedNodesSyntax? = nil,
+      assignToken: TokenSyntax = .equalToken(),
+      _ unexpectedAfterAssignToken: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeAssignToken, 
+        equal: assignToken, 
+        unexpectedAfterAssignToken, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension AttributeSyntax {
+  @available(*, deprecated, renamed: "unexpectedBeforeAtSign")
+  public var unexpectedBeforeAtSignToken: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBeforeAtSign
+    }
+    set {
+      unexpectedBeforeAtSign = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "atSign")
+  public var atSignToken: TokenSyntax {
+    get {
+      return atSign
+    }
+    set {
+      atSign = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenAtSignAndAttributeName")
+  public var unexpectedBetweenAtSignTokenAndAttributeName: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenAtSignAndAttributeName
+    }
+    set {
+      unexpectedBetweenAtSignAndAttributeName = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with atSign argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeAtSignToken: UnexpectedNodesSyntax? = nil,
+      atSignToken: TokenSyntax = .atSignToken(),
+      _ unexpectedBetweenAtSignTokenAndAttributeName: UnexpectedNodesSyntax? = nil,
+      attributeName: some TypeSyntaxProtocol,
+      _ unexpectedBetweenAttributeNameAndLeftParen: UnexpectedNodesSyntax? = nil,
+      leftParen: TokenSyntax? = nil,
+      _ unexpectedBetweenLeftParenAndArgument: UnexpectedNodesSyntax? = nil,
+      argument: Argument? = nil,
+      _ unexpectedBetweenArgumentAndRightParen: UnexpectedNodesSyntax? = nil,
+      rightParen: TokenSyntax? = nil,
+      _ unexpectedAfterRightParen: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeAtSignToken, 
+        atSign: atSignToken, 
+        unexpectedBetweenAtSignTokenAndAttributeName, 
+        attributeName: attributeName, 
+        unexpectedBetweenAttributeNameAndLeftParen, 
+        leftParen: leftParen, 
+        unexpectedBetweenLeftParenAndArgument, 
+        argument: argument, 
+        unexpectedBetweenArgumentAndRightParen, 
+        rightParen: rightParen, 
+        unexpectedAfterRightParen, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
 extension AvailabilityConditionSyntax {
   @available(*, deprecated, renamed: "unexpectedBetweenLeftParenAndAvailabilityArguments")
   public var unexpectedBetweenLeftParenAndAvailabilitySpec: UnexpectedNodesSyntax? {
@@ -221,7 +457,7 @@ extension AvailabilityConditionSyntax {
     }
   }
   
-  @available(*, deprecated, message: "Use an initializer with availabilitySpec argument(s).")
+  @available(*, deprecated, message: "Use an initializer with availabilityArguments argument(s).")
   @_disfavoredOverload
   public init(
       leadingTrivia: Trivia? = nil,
@@ -254,6 +490,36 @@ extension AvailabilityConditionSyntax {
 }
 
 extension AvailabilityEntrySyntax {
+  @available(*, deprecated, renamed: "unexpectedBeforeAvailabilityLabel")
+  public var unexpectedBeforeLabel: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBeforeAvailabilityLabel
+    }
+    set {
+      unexpectedBeforeAvailabilityLabel = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "availabilityLabel")
+  public var label: TokenSyntax {
+    get {
+      return availabilityLabel
+    }
+    set {
+      availabilityLabel = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenAvailabilityLabelAndColon")
+  public var unexpectedBetweenLabelAndColon: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenAvailabilityLabelAndColon
+    }
+    set {
+      unexpectedBetweenAvailabilityLabelAndColon = newValue
+    }
+  }
+  
   @available(*, deprecated, renamed: "unexpectedBetweenColonAndAvailabilityArguments")
   public var unexpectedBetweenColonAndAvailabilityList: UnexpectedNodesSyntax? {
     get {
@@ -289,7 +555,7 @@ extension AvailabilityEntrySyntax {
     }
   }
   
-  @available(*, deprecated, message: "Use an initializer with availabilityList argument(s).")
+  @available(*, deprecated, message: "Use an initializer with availabilityLabel, availabilityArguments argument(s).")
   @_disfavoredOverload
   public init(
       leadingTrivia: Trivia? = nil,
@@ -308,7 +574,7 @@ extension AvailabilityEntrySyntax {
     self.init(
         leadingTrivia: leadingTrivia, 
         unexpectedBeforeLabel, 
-        label: label, 
+        availabilityLabel: label, 
         unexpectedBetweenLabelAndColon, 
         colon: colon, 
         unexpectedBetweenColonAndAvailabilityList, 
@@ -357,7 +623,7 @@ extension BackDeployedAttributeSpecListSyntax {
     }
   }
   
-  @available(*, deprecated, message: "Use an initializer with versionList argument(s).")
+  @available(*, deprecated, message: "Use an initializer with platforms argument(s).")
   @_disfavoredOverload
   public init(
       leadingTrivia: Trivia? = nil,
@@ -385,6 +651,195 @@ extension BackDeployedAttributeSpecListSyntax {
   }
 }
 
+extension BinaryOperatorExprSyntax {
+  @available(*, deprecated, renamed: "unexpectedBeforeOperator")
+  public var unexpectedBeforeOperatorToken: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBeforeOperator
+    }
+    set {
+      unexpectedBeforeOperator = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "operator")
+  public var operatorToken: TokenSyntax {
+    get {
+      return `operator`
+    }
+    set {
+      `operator` = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedAfterOperator")
+  public var unexpectedAfterOperatorToken: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedAfterOperator
+    }
+    set {
+      unexpectedAfterOperator = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with operator argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeOperatorToken: UnexpectedNodesSyntax? = nil,
+      operatorToken: TokenSyntax,
+      _ unexpectedAfterOperatorToken: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeOperatorToken, 
+        operator: operatorToken, 
+        unexpectedAfterOperatorToken, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension ClosureCaptureItemSyntax {
+  @available(*, deprecated, renamed: "unexpectedBetweenNameAndEqual")
+  public var unexpectedBetweenNameAndAssignToken: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenNameAndEqual
+    }
+    set {
+      unexpectedBetweenNameAndEqual = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "equal")
+  public var assignToken: TokenSyntax? {
+    get {
+      return equal
+    }
+    set {
+      equal = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenEqualAndExpression")
+  public var unexpectedBetweenAssignTokenAndExpression: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenEqualAndExpression
+    }
+    set {
+      unexpectedBetweenEqualAndExpression = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with equal argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeSpecifier: UnexpectedNodesSyntax? = nil,
+      specifier: ClosureCaptureItemSpecifierSyntax? = nil,
+      _ unexpectedBetweenSpecifierAndName: UnexpectedNodesSyntax? = nil,
+      name: TokenSyntax? = nil,
+      _ unexpectedBetweenNameAndAssignToken: UnexpectedNodesSyntax? = nil,
+      assignToken: TokenSyntax? = nil,
+      _ unexpectedBetweenAssignTokenAndExpression: UnexpectedNodesSyntax? = nil,
+      expression: some ExprSyntaxProtocol,
+      _ unexpectedBetweenExpressionAndTrailingComma: UnexpectedNodesSyntax? = nil,
+      trailingComma: TokenSyntax? = nil,
+      _ unexpectedAfterTrailingComma: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeSpecifier, 
+        specifier: specifier, 
+        unexpectedBetweenSpecifierAndName, 
+        name: name, 
+        unexpectedBetweenNameAndAssignToken, 
+        equal: assignToken, 
+        unexpectedBetweenAssignTokenAndExpression, 
+        expression: expression, 
+        unexpectedBetweenExpressionAndTrailingComma, 
+        trailingComma: trailingComma, 
+        unexpectedAfterTrailingComma, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension ClosureSignatureSyntax {
+  @available(*, deprecated, renamed: "unexpectedBetweenOutputAndInKeyword")
+  public var unexpectedBetweenOutputAndInTok: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenOutputAndInKeyword
+    }
+    set {
+      unexpectedBetweenOutputAndInKeyword = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "inKeyword")
+  public var inTok: TokenSyntax {
+    get {
+      return inKeyword
+    }
+    set {
+      inKeyword = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedAfterInKeyword")
+  public var unexpectedAfterInTok: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedAfterInKeyword
+    }
+    set {
+      unexpectedAfterInKeyword = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with inKeyword argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeAttributes: UnexpectedNodesSyntax? = nil,
+      attributes: AttributeListSyntax? = nil,
+      _ unexpectedBetweenAttributesAndCapture: UnexpectedNodesSyntax? = nil,
+      capture: ClosureCaptureSignatureSyntax? = nil,
+      _ unexpectedBetweenCaptureAndInput: UnexpectedNodesSyntax? = nil,
+      input: Input? = nil,
+      _ unexpectedBetweenInputAndEffectSpecifiers: UnexpectedNodesSyntax? = nil,
+      effectSpecifiers: TypeEffectSpecifiersSyntax? = nil,
+      _ unexpectedBetweenEffectSpecifiersAndOutput: UnexpectedNodesSyntax? = nil,
+      output: ReturnClauseSyntax? = nil,
+      _ unexpectedBetweenOutputAndInTok: UnexpectedNodesSyntax? = nil,
+      inTok: TokenSyntax = .keyword(.in),
+      _ unexpectedAfterInTok: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeAttributes, 
+        attributes: attributes, 
+        unexpectedBetweenAttributesAndCapture, 
+        capture: capture, 
+        unexpectedBetweenCaptureAndInput, 
+        input: input, 
+        unexpectedBetweenInputAndEffectSpecifiers, 
+        effectSpecifiers: effectSpecifiers, 
+        unexpectedBetweenEffectSpecifiersAndOutput, 
+        output: output, 
+        unexpectedBetweenOutputAndInTok, 
+        inKeyword: inTok, 
+        unexpectedAfterInTok, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
 extension DictionaryTypeSyntax {
   @available(*, deprecated, renamed: "unexpectedBeforeLeftSquare")
   public var unexpectedBeforeLeftSquareBracket: UnexpectedNodesSyntax? {
@@ -446,7 +901,7 @@ extension DictionaryTypeSyntax {
     }
   }
   
-  @available(*, deprecated, message: "Use an initializer with leftSquareBracket, rightSquareBracket argument(s).")
+  @available(*, deprecated, message: "Use an initializer with leftSquare, rightSquare argument(s).")
   @_disfavoredOverload
   public init(
       leadingTrivia: Trivia? = nil,
@@ -513,7 +968,7 @@ extension EditorPlaceholderDeclSyntax {
     }
   }
   
-  @available(*, deprecated, message: "Use an initializer with identifier argument(s).")
+  @available(*, deprecated, message: "Use an initializer with placeholder argument(s).")
   @_disfavoredOverload
   public init(
       leadingTrivia: Trivia? = nil,
@@ -572,7 +1027,7 @@ extension EnumDeclSyntax {
     }
   }
   
-  @available(*, deprecated, message: "Use an initializer with genericParameters argument(s).")
+  @available(*, deprecated, message: "Use an initializer with genericParameterClause argument(s).")
   @_disfavoredOverload
   public init(
       leadingTrivia: Trivia? = nil,
@@ -620,18 +1075,136 @@ extension EnumDeclSyntax {
   }
 }
 
-extension FunctionTypeSyntax {
-  @available(*, deprecated, renamed: "unexpectedBetweenLeftParenAndParameters")
-  public var unexpectedBetweenLeftParenAndarguments: UnexpectedNodesSyntax? {
+extension ExpressionSegmentSyntax {
+  @available(*, deprecated, renamed: "unexpectedBetweenBackslashAndRawStringDelimiter")
+  public var unexpectedBetweenBackslashAndDelimiter: UnexpectedNodesSyntax? {
     get {
-      return unexpectedBetweenLeftParenAndParameters
+      return unexpectedBetweenBackslashAndRawStringDelimiter
     }
     set {
-      unexpectedBetweenLeftParenAndParameters = newValue
+      unexpectedBetweenBackslashAndRawStringDelimiter = newValue
     }
   }
   
-  @available(*, deprecated, renamed: "parameters")
+  @available(*, deprecated, renamed: "rawStringDelimiter")
+  public var delimiter: TokenSyntax? {
+    get {
+      return rawStringDelimiter
+    }
+    set {
+      rawStringDelimiter = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenRawStringDelimiterAndLeftParen")
+  public var unexpectedBetweenDelimiterAndLeftParen: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenRawStringDelimiterAndLeftParen
+    }
+    set {
+      unexpectedBetweenRawStringDelimiterAndLeftParen = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with rawStringDelimiter argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeBackslash: UnexpectedNodesSyntax? = nil,
+      backslash: TokenSyntax = .backslashToken(),
+      _ unexpectedBetweenBackslashAndDelimiter: UnexpectedNodesSyntax? = nil,
+      delimiter: TokenSyntax? = nil,
+      _ unexpectedBetweenDelimiterAndLeftParen: UnexpectedNodesSyntax? = nil,
+      leftParen: TokenSyntax = .leftParenToken(),
+      _ unexpectedBetweenLeftParenAndExpressions: UnexpectedNodesSyntax? = nil,
+      expressions: TupleExprElementListSyntax,
+      _ unexpectedBetweenExpressionsAndRightParen: UnexpectedNodesSyntax? = nil,
+      rightParen: TokenSyntax = .rightParenToken(),
+      _ unexpectedAfterRightParen: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeBackslash, 
+        backslash: backslash, 
+        unexpectedBetweenBackslashAndDelimiter, 
+        rawStringDelimiter: delimiter, 
+        unexpectedBetweenDelimiterAndLeftParen, 
+        leftParen: leftParen, 
+        unexpectedBetweenLeftParenAndExpressions, 
+        expressions: expressions, 
+        unexpectedBetweenExpressionsAndRightParen, 
+        rightParen: rightParen, 
+        unexpectedAfterRightParen, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension FloatLiteralExprSyntax {
+  @available(*, deprecated, renamed: "unexpectedBeforeDigits")
+  public var unexpectedBeforeFloatingDigits: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBeforeDigits
+    }
+    set {
+      unexpectedBeforeDigits = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "digits")
+  public var floatingDigits: TokenSyntax {
+    get {
+      return digits
+    }
+    set {
+      digits = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedAfterDigits")
+  public var unexpectedAfterFloatingDigits: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedAfterDigits
+    }
+    set {
+      unexpectedAfterDigits = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with digits argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeFloatingDigits: UnexpectedNodesSyntax? = nil,
+      floatingDigits: TokenSyntax,
+      _ unexpectedAfterFloatingDigits: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeFloatingDigits, 
+        digits: floatingDigits, 
+        unexpectedAfterFloatingDigits, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension FunctionTypeSyntax {
+  @available(*, deprecated, renamed: "unexpectedBetweenLeftParenAndParameters")
+  public var unexpectedBetweenLeftParenAndarguments: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenLeftParenAndParameters
+    }
+    set {
+      unexpectedBetweenLeftParenAndParameters = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "parameters")
   public var arguments: TupleTypeElementListSyntax {
     get {
       return parameters
@@ -656,7 +1229,7 @@ extension FunctionTypeSyntax {
     }
   }
   
-  @available(*, deprecated, message: "Use an initializer with arguments argument(s).")
+  @available(*, deprecated, message: "Use an initializer with parameters argument(s).")
   @_disfavoredOverload
   public init(
       leadingTrivia: Trivia? = nil,
@@ -692,14 +1265,123 @@ extension FunctionTypeSyntax {
   }
 }
 
+extension GenericArgumentClauseSyntax {
+  @available(*, deprecated, renamed: "unexpectedBeforeLeftAngle")
+  public var unexpectedBeforeLeftAngleBracket: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBeforeLeftAngle
+    }
+    set {
+      unexpectedBeforeLeftAngle = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "leftAngle")
+  public var leftAngleBracket: TokenSyntax {
+    get {
+      return leftAngle
+    }
+    set {
+      leftAngle = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenLeftAngleAndArguments")
+  public var unexpectedBetweenLeftAngleBracketAndArguments: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenLeftAngleAndArguments
+    }
+    set {
+      unexpectedBetweenLeftAngleAndArguments = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenArgumentsAndRightAngle")
+  public var unexpectedBetweenArgumentsAndRightAngleBracket: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenArgumentsAndRightAngle
+    }
+    set {
+      unexpectedBetweenArgumentsAndRightAngle = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "rightAngle")
+  public var rightAngleBracket: TokenSyntax {
+    get {
+      return rightAngle
+    }
+    set {
+      rightAngle = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedAfterRightAngle")
+  public var unexpectedAfterRightAngleBracket: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedAfterRightAngle
+    }
+    set {
+      unexpectedAfterRightAngle = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with leftAngle, rightAngle argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeLeftAngleBracket: UnexpectedNodesSyntax? = nil,
+      leftAngleBracket: TokenSyntax = .leftAngleToken(),
+      _ unexpectedBetweenLeftAngleBracketAndArguments: UnexpectedNodesSyntax? = nil,
+      arguments: GenericArgumentListSyntax,
+      _ unexpectedBetweenArgumentsAndRightAngleBracket: UnexpectedNodesSyntax? = nil,
+      rightAngleBracket: TokenSyntax = .rightAngleToken(),
+      _ unexpectedAfterRightAngleBracket: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeLeftAngleBracket, 
+        leftAngle: leftAngleBracket, 
+        unexpectedBetweenLeftAngleBracketAndArguments, 
+        arguments: arguments, 
+        unexpectedBetweenArgumentsAndRightAngleBracket, 
+        rightAngle: rightAngleBracket, 
+        unexpectedAfterRightAngleBracket, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
 extension GenericParameterClauseSyntax {
-  @available(*, deprecated, renamed: "unexpectedBetweenLeftAngleBracketAndParameters")
+  @available(*, deprecated, renamed: "unexpectedBeforeLeftAngle")
+  public var unexpectedBeforeLeftAngleBracket: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBeforeLeftAngle
+    }
+    set {
+      unexpectedBeforeLeftAngle = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "leftAngle")
+  public var leftAngleBracket: TokenSyntax {
+    get {
+      return leftAngle
+    }
+    set {
+      leftAngle = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenLeftAngleAndParameters")
   public var unexpectedBetweenLeftAngleBracketAndGenericParameterList: UnexpectedNodesSyntax? {
     get {
-      return unexpectedBetweenLeftAngleBracketAndParameters
+      return unexpectedBetweenLeftAngleAndParameters
     }
     set {
-      unexpectedBetweenLeftAngleBracketAndParameters = newValue
+      unexpectedBetweenLeftAngleAndParameters = newValue
     }
   }
   
@@ -728,7 +1410,37 @@ extension GenericParameterClauseSyntax {
     }
   }
   
-  @available(*, deprecated, message: "Use an initializer with genericParameterList argument(s).")
+  @available(*, deprecated, renamed: "unexpectedBetweenGenericWhereClauseAndRightAngle")
+  public var unexpectedBetweenGenericWhereClauseAndRightAngleBracket: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenGenericWhereClauseAndRightAngle
+    }
+    set {
+      unexpectedBetweenGenericWhereClauseAndRightAngle = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "rightAngle")
+  public var rightAngleBracket: TokenSyntax {
+    get {
+      return rightAngle
+    }
+    set {
+      rightAngle = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedAfterRightAngle")
+  public var unexpectedAfterRightAngleBracket: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedAfterRightAngle
+    }
+    set {
+      unexpectedAfterRightAngle = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with leftAngle, parameters, rightAngle argument(s).")
   @_disfavoredOverload
   public init(
       leadingTrivia: Trivia? = nil,
@@ -747,19 +1459,90 @@ extension GenericParameterClauseSyntax {
     self.init(
         leadingTrivia: leadingTrivia, 
         unexpectedBeforeLeftAngleBracket, 
-        leftAngleBracket: leftAngleBracket, 
+        leftAngle: leftAngleBracket, 
         unexpectedBetweenLeftAngleBracketAndGenericParameterList, 
         parameters: genericParameterList, 
         unexpectedBetweenGenericParameterListAndGenericWhereClause, 
         genericWhereClause: genericWhereClause, 
         unexpectedBetweenGenericWhereClauseAndRightAngleBracket, 
-        rightAngleBracket: rightAngleBracket, 
+        rightAngle: rightAngleBracket, 
         unexpectedAfterRightAngleBracket, 
         trailingTrivia: trailingTrivia
       )
   }
 }
 
+extension GenericParameterSyntax {
+  @available(*, deprecated, renamed: "unexpectedBetweenAttributesAndEachKeyword")
+  public var unexpectedBetweenAttributesAndEach: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenAttributesAndEachKeyword
+    }
+    set {
+      unexpectedBetweenAttributesAndEachKeyword = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "eachKeyword")
+  public var each: TokenSyntax? {
+    get {
+      return eachKeyword
+    }
+    set {
+      eachKeyword = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenEachKeywordAndName")
+  public var unexpectedBetweenEachAndName: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenEachKeywordAndName
+    }
+    set {
+      unexpectedBetweenEachKeywordAndName = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with eachKeyword argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeAttributes: UnexpectedNodesSyntax? = nil,
+      attributes: AttributeListSyntax? = nil,
+      _ unexpectedBetweenAttributesAndEach: UnexpectedNodesSyntax? = nil,
+      each: TokenSyntax? = nil,
+      _ unexpectedBetweenEachAndName: UnexpectedNodesSyntax? = nil,
+      name: TokenSyntax,
+      _ unexpectedBetweenNameAndColon: UnexpectedNodesSyntax? = nil,
+      colon: TokenSyntax? = nil,
+      _ unexpectedBetweenColonAndInheritedType: UnexpectedNodesSyntax? = nil,
+      inheritedType: (some TypeSyntaxProtocol)? = TypeSyntax?.none,
+      _ unexpectedBetweenInheritedTypeAndTrailingComma: UnexpectedNodesSyntax? = nil,
+      trailingComma: TokenSyntax? = nil,
+      _ unexpectedAfterTrailingComma: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeAttributes, 
+        attributes: attributes, 
+        unexpectedBetweenAttributesAndEach, 
+        eachKeyword: each, 
+        unexpectedBetweenEachAndName, 
+        name: name, 
+        unexpectedBetweenNameAndColon, 
+        colon: colon, 
+        unexpectedBetweenColonAndInheritedType, 
+        inheritedType: inheritedType, 
+        unexpectedBetweenInheritedTypeAndTrailingComma, 
+        trailingComma: trailingComma, 
+        unexpectedAfterTrailingComma, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
 extension ImportDeclSyntax {
   @available(*, deprecated, renamed: "unexpectedBetweenModifiersAndImportKeyword")
   public var unexpectedBetweenModifiersAndImportTok: UnexpectedNodesSyntax? {
@@ -791,7 +1574,7 @@ extension ImportDeclSyntax {
     }
   }
   
-  @available(*, deprecated, message: "Use an initializer with importTok argument(s).")
+  @available(*, deprecated, message: "Use an initializer with importKeyword argument(s).")
   @_disfavoredOverload
   public init(
       leadingTrivia: Trivia? = nil,
@@ -827,133 +1610,1455 @@ extension ImportDeclSyntax {
   }
 }
 
-extension NamedOpaqueReturnTypeSyntax {
-  @available(*, deprecated, renamed: "unexpectedBeforeGenericParameterClause")
-  public var unexpectedBeforeGenericParameters: UnexpectedNodesSyntax? {
+extension ImportPathComponentSyntax {
+  @available(*, deprecated, renamed: "unexpectedBetweenNameAndTrailingPeriod")
+  public var unexpectedBetweenNameAndTrailingDot: UnexpectedNodesSyntax? {
     get {
-      return unexpectedBeforeGenericParameterClause
+      return unexpectedBetweenNameAndTrailingPeriod
     }
     set {
-      unexpectedBeforeGenericParameterClause = newValue
+      unexpectedBetweenNameAndTrailingPeriod = newValue
     }
   }
   
-  @available(*, deprecated, renamed: "genericParameterClause")
-  public var genericParameters: GenericParameterClauseSyntax {
+  @available(*, deprecated, renamed: "trailingPeriod")
+  public var trailingDot: TokenSyntax? {
     get {
-      return genericParameterClause
+      return trailingPeriod
     }
     set {
-      genericParameterClause = newValue
+      trailingPeriod = newValue
     }
   }
   
-  @available(*, deprecated, renamed: "unexpectedBetweenGenericParameterClauseAndBaseType")
-  public var unexpectedBetweenGenericParametersAndBaseType: UnexpectedNodesSyntax? {
+  @available(*, deprecated, renamed: "unexpectedAfterTrailingPeriod")
+  public var unexpectedAfterTrailingDot: UnexpectedNodesSyntax? {
     get {
-      return unexpectedBetweenGenericParameterClauseAndBaseType
+      return unexpectedAfterTrailingPeriod
     }
     set {
-      unexpectedBetweenGenericParameterClauseAndBaseType = newValue
+      unexpectedAfterTrailingPeriod = newValue
     }
   }
   
-  @available(*, deprecated, message: "Use an initializer with genericParameters argument(s).")
+  @available(*, deprecated, message: "Use an initializer with trailingPeriod argument(s).")
   @_disfavoredOverload
   public init(
       leadingTrivia: Trivia? = nil,
-      _ unexpectedBeforeGenericParameters: UnexpectedNodesSyntax? = nil,
-      genericParameters: GenericParameterClauseSyntax,
-      _ unexpectedBetweenGenericParametersAndBaseType: UnexpectedNodesSyntax? = nil,
-      baseType: some TypeSyntaxProtocol,
-      _ unexpectedAfterBaseType: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBeforeName: UnexpectedNodesSyntax? = nil,
+      name: TokenSyntax,
+      _ unexpectedBetweenNameAndTrailingDot: UnexpectedNodesSyntax? = nil,
+      trailingDot: TokenSyntax? = nil,
+      _ unexpectedAfterTrailingDot: UnexpectedNodesSyntax? = nil,
       trailingTrivia: Trivia? = nil
     
   ) {
     self.init(
         leadingTrivia: leadingTrivia, 
-        unexpectedBeforeGenericParameters, 
-        genericParameterClause: genericParameters, 
-        unexpectedBetweenGenericParametersAndBaseType, 
-        baseType: baseType, 
-        unexpectedAfterBaseType, 
+        unexpectedBeforeName, 
+        name: name, 
+        unexpectedBetweenNameAndTrailingDot, 
+        trailingPeriod: trailingDot, 
+        unexpectedAfterTrailingDot, 
         trailingTrivia: trailingTrivia
       )
   }
 }
 
-extension PrecedenceGroupRelationSyntax {
-  @available(*, deprecated, renamed: "unexpectedBeforeHigherThanOrLowerThanKeyword")
-  public var unexpectedBeforeHigherThanOrLowerThan: UnexpectedNodesSyntax? {
+extension IsExprSyntax {
+  @available(*, deprecated, renamed: "unexpectedBetweenExpressionAndIsKeyword")
+  public var unexpectedBetweenExpressionAndIsTok: UnexpectedNodesSyntax? {
     get {
-      return unexpectedBeforeHigherThanOrLowerThanKeyword
+      return unexpectedBetweenExpressionAndIsKeyword
     }
     set {
-      unexpectedBeforeHigherThanOrLowerThanKeyword = newValue
+      unexpectedBetweenExpressionAndIsKeyword = newValue
     }
   }
   
-  @available(*, deprecated, renamed: "higherThanOrLowerThanKeyword")
-  public var higherThanOrLowerThan: TokenSyntax {
+  @available(*, deprecated, renamed: "isKeyword")
+  public var isTok: TokenSyntax {
     get {
-      return higherThanOrLowerThanKeyword
+      return isKeyword
     }
     set {
-      higherThanOrLowerThanKeyword = newValue
+      isKeyword = newValue
     }
   }
   
-  @available(*, deprecated, renamed: "unexpectedBetweenHigherThanOrLowerThanKeywordAndColon")
-  public var unexpectedBetweenHigherThanOrLowerThanAndColon: UnexpectedNodesSyntax? {
+  @available(*, deprecated, renamed: "unexpectedBetweenIsKeywordAndTypeName")
+  public var unexpectedBetweenIsTokAndTypeName: UnexpectedNodesSyntax? {
     get {
-      return unexpectedBetweenHigherThanOrLowerThanKeywordAndColon
+      return unexpectedBetweenIsKeywordAndTypeName
     }
     set {
-      unexpectedBetweenHigherThanOrLowerThanKeywordAndColon = newValue
+      unexpectedBetweenIsKeywordAndTypeName = newValue
     }
   }
   
-  @available(*, deprecated, message: "Use an initializer with higherThanOrLowerThan argument(s).")
+  @available(*, deprecated, message: "Use an initializer with isKeyword argument(s).")
   @_disfavoredOverload
   public init(
       leadingTrivia: Trivia? = nil,
-      _ unexpectedBeforeHigherThanOrLowerThan: UnexpectedNodesSyntax? = nil,
-      higherThanOrLowerThan: TokenSyntax,
-      _ unexpectedBetweenHigherThanOrLowerThanAndColon: UnexpectedNodesSyntax? = nil,
-      colon: TokenSyntax = .colonToken(),
-      _ unexpectedBetweenColonAndOtherNames: UnexpectedNodesSyntax? = nil,
-      otherNames: PrecedenceGroupNameListSyntax,
-      _ unexpectedAfterOtherNames: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBeforeExpression: UnexpectedNodesSyntax? = nil,
+      expression: some ExprSyntaxProtocol,
+      _ unexpectedBetweenExpressionAndIsTok: UnexpectedNodesSyntax? = nil,
+      isTok: TokenSyntax = .keyword(.is),
+      _ unexpectedBetweenIsTokAndTypeName: UnexpectedNodesSyntax? = nil,
+      typeName: some TypeSyntaxProtocol,
+      _ unexpectedAfterTypeName: UnexpectedNodesSyntax? = nil,
       trailingTrivia: Trivia? = nil
     
   ) {
     self.init(
         leadingTrivia: leadingTrivia, 
-        unexpectedBeforeHigherThanOrLowerThan, 
-        higherThanOrLowerThanKeyword: higherThanOrLowerThan, 
-        unexpectedBetweenHigherThanOrLowerThanAndColon, 
-        colon: colon, 
-        unexpectedBetweenColonAndOtherNames, 
-        otherNames: otherNames, 
-        unexpectedAfterOtherNames, 
+        unexpectedBeforeExpression, 
+        expression: expression, 
+        unexpectedBetweenExpressionAndIsTok, 
+        isKeyword: isTok, 
+        unexpectedBetweenIsTokAndTypeName, 
+        typeName: typeName, 
+        unexpectedAfterTypeName, 
         trailingTrivia: trailingTrivia
       )
   }
 }
 
-extension TupleExprSyntax {
-  @available(*, deprecated, renamed: "unexpectedBetweenLeftParenAndElements")
-  public var unexpectedBetweenLeftParenAndElementList: UnexpectedNodesSyntax? {
+extension KeyPathSubscriptComponentSyntax {
+  @available(*, deprecated, renamed: "unexpectedBeforeLeftSquare")
+  public var unexpectedBeforeLeftBracket: UnexpectedNodesSyntax? {
     get {
-      return unexpectedBetweenLeftParenAndElements
+      return unexpectedBeforeLeftSquare
     }
     set {
-      unexpectedBetweenLeftParenAndElements = newValue
+      unexpectedBeforeLeftSquare = newValue
     }
   }
   
-  @available(*, deprecated, renamed: "elements")
-  public var elementList: TupleExprElementListSyntax {
+  @available(*, deprecated, renamed: "leftSquare")
+  public var leftBracket: TokenSyntax {
+    get {
+      return leftSquare
+    }
+    set {
+      leftSquare = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenLeftSquareAndArgumentList")
+  public var unexpectedBetweenLeftBracketAndArgumentList: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenLeftSquareAndArgumentList
+    }
+    set {
+      unexpectedBetweenLeftSquareAndArgumentList = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenArgumentListAndRightSquare")
+  public var unexpectedBetweenArgumentListAndRightBracket: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenArgumentListAndRightSquare
+    }
+    set {
+      unexpectedBetweenArgumentListAndRightSquare = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "rightSquare")
+  public var rightBracket: TokenSyntax {
+    get {
+      return rightSquare
+    }
+    set {
+      rightSquare = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedAfterRightSquare")
+  public var unexpectedAfterRightBracket: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedAfterRightSquare
+    }
+    set {
+      unexpectedAfterRightSquare = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with leftSquare, rightSquare argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeLeftBracket: UnexpectedNodesSyntax? = nil,
+      leftBracket: TokenSyntax = .leftSquareToken(),
+      _ unexpectedBetweenLeftBracketAndArgumentList: UnexpectedNodesSyntax? = nil,
+      argumentList: TupleExprElementListSyntax,
+      _ unexpectedBetweenArgumentListAndRightBracket: UnexpectedNodesSyntax? = nil,
+      rightBracket: TokenSyntax = .rightSquareToken(),
+      _ unexpectedAfterRightBracket: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeLeftBracket, 
+        leftSquare: leftBracket, 
+        unexpectedBetweenLeftBracketAndArgumentList, 
+        argumentList: argumentList, 
+        unexpectedBetweenArgumentListAndRightBracket, 
+        rightSquare: rightBracket, 
+        unexpectedAfterRightBracket, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension LabeledStmtSyntax {
+  @available(*, deprecated, renamed: "unexpectedBeforeLabel")
+  public var unexpectedBeforeLabelName: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBeforeLabel
+    }
+    set {
+      unexpectedBeforeLabel = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "label")
+  public var labelName: TokenSyntax {
+    get {
+      return label
+    }
+    set {
+      label = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenLabelAndColon")
+  public var unexpectedBetweenLabelNameAndLabelColon: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenLabelAndColon
+    }
+    set {
+      unexpectedBetweenLabelAndColon = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "colon")
+  public var labelColon: TokenSyntax {
+    get {
+      return colon
+    }
+    set {
+      colon = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenColonAndStatement")
+  public var unexpectedBetweenLabelColonAndStatement: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenColonAndStatement
+    }
+    set {
+      unexpectedBetweenColonAndStatement = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with label, colon argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeLabelName: UnexpectedNodesSyntax? = nil,
+      labelName: TokenSyntax,
+      _ unexpectedBetweenLabelNameAndLabelColon: UnexpectedNodesSyntax? = nil,
+      labelColon: TokenSyntax = .colonToken(),
+      _ unexpectedBetweenLabelColonAndStatement: UnexpectedNodesSyntax? = nil,
+      statement: some StmtSyntaxProtocol,
+      _ unexpectedAfterStatement: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeLabelName, 
+        label: labelName, 
+        unexpectedBetweenLabelNameAndLabelColon, 
+        colon: labelColon, 
+        unexpectedBetweenLabelColonAndStatement, 
+        statement: statement, 
+        unexpectedAfterStatement, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension MacroExpansionDeclSyntax {
+  @available(*, deprecated, renamed: "unexpectedBetweenModifiersAndPound")
+  public var unexpectedBetweenModifiersAndPoundToken: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenModifiersAndPound
+    }
+    set {
+      unexpectedBetweenModifiersAndPound = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "pound")
+  public var poundToken: TokenSyntax {
+    get {
+      return pound
+    }
+    set {
+      pound = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenPoundAndMacro")
+  public var unexpectedBetweenPoundTokenAndMacro: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenPoundAndMacro
+    }
+    set {
+      unexpectedBetweenPoundAndMacro = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with pound argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeAttributes: UnexpectedNodesSyntax? = nil,
+      attributes: AttributeListSyntax? = nil,
+      _ unexpectedBetweenAttributesAndModifiers: UnexpectedNodesSyntax? = nil,
+      modifiers: ModifierListSyntax? = nil,
+      _ unexpectedBetweenModifiersAndPoundToken: UnexpectedNodesSyntax? = nil,
+      poundToken: TokenSyntax = .poundToken(),
+      _ unexpectedBetweenPoundTokenAndMacro: UnexpectedNodesSyntax? = nil,
+      macro: TokenSyntax,
+      _ unexpectedBetweenMacroAndGenericArguments: UnexpectedNodesSyntax? = nil,
+      genericArguments: GenericArgumentClauseSyntax? = nil,
+      _ unexpectedBetweenGenericArgumentsAndLeftParen: UnexpectedNodesSyntax? = nil,
+      leftParen: TokenSyntax? = nil,
+      _ unexpectedBetweenLeftParenAndArgumentList: UnexpectedNodesSyntax? = nil,
+      argumentList: TupleExprElementListSyntax,
+      _ unexpectedBetweenArgumentListAndRightParen: UnexpectedNodesSyntax? = nil,
+      rightParen: TokenSyntax? = nil,
+      _ unexpectedBetweenRightParenAndTrailingClosure: UnexpectedNodesSyntax? = nil,
+      trailingClosure: ClosureExprSyntax? = nil,
+      _ unexpectedBetweenTrailingClosureAndAdditionalTrailingClosures: UnexpectedNodesSyntax? = nil,
+      additionalTrailingClosures: MultipleTrailingClosureElementListSyntax? = nil,
+      _ unexpectedAfterAdditionalTrailingClosures: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeAttributes, 
+        attributes: attributes, 
+        unexpectedBetweenAttributesAndModifiers, 
+        modifiers: modifiers, 
+        unexpectedBetweenModifiersAndPoundToken, 
+        pound: poundToken, 
+        unexpectedBetweenPoundTokenAndMacro, 
+        macro: macro, 
+        unexpectedBetweenMacroAndGenericArguments, 
+        genericArguments: genericArguments, 
+        unexpectedBetweenGenericArgumentsAndLeftParen, 
+        leftParen: leftParen, 
+        unexpectedBetweenLeftParenAndArgumentList, 
+        argumentList: argumentList, 
+        unexpectedBetweenArgumentListAndRightParen, 
+        rightParen: rightParen, 
+        unexpectedBetweenRightParenAndTrailingClosure, 
+        trailingClosure: trailingClosure, 
+        unexpectedBetweenTrailingClosureAndAdditionalTrailingClosures, 
+        additionalTrailingClosures: additionalTrailingClosures, 
+        unexpectedAfterAdditionalTrailingClosures, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension MacroExpansionExprSyntax {
+  @available(*, deprecated, renamed: "unexpectedBeforePound")
+  public var unexpectedBeforePoundToken: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBeforePound
+    }
+    set {
+      unexpectedBeforePound = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "pound")
+  public var poundToken: TokenSyntax {
+    get {
+      return pound
+    }
+    set {
+      pound = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenPoundAndMacro")
+  public var unexpectedBetweenPoundTokenAndMacro: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenPoundAndMacro
+    }
+    set {
+      unexpectedBetweenPoundAndMacro = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with pound argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforePoundToken: UnexpectedNodesSyntax? = nil,
+      poundToken: TokenSyntax = .poundToken(),
+      _ unexpectedBetweenPoundTokenAndMacro: UnexpectedNodesSyntax? = nil,
+      macro: TokenSyntax,
+      _ unexpectedBetweenMacroAndGenericArguments: UnexpectedNodesSyntax? = nil,
+      genericArguments: GenericArgumentClauseSyntax? = nil,
+      _ unexpectedBetweenGenericArgumentsAndLeftParen: UnexpectedNodesSyntax? = nil,
+      leftParen: TokenSyntax? = nil,
+      _ unexpectedBetweenLeftParenAndArgumentList: UnexpectedNodesSyntax? = nil,
+      argumentList: TupleExprElementListSyntax,
+      _ unexpectedBetweenArgumentListAndRightParen: UnexpectedNodesSyntax? = nil,
+      rightParen: TokenSyntax? = nil,
+      _ unexpectedBetweenRightParenAndTrailingClosure: UnexpectedNodesSyntax? = nil,
+      trailingClosure: ClosureExprSyntax? = nil,
+      _ unexpectedBetweenTrailingClosureAndAdditionalTrailingClosures: UnexpectedNodesSyntax? = nil,
+      additionalTrailingClosures: MultipleTrailingClosureElementListSyntax? = nil,
+      _ unexpectedAfterAdditionalTrailingClosures: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforePoundToken, 
+        pound: poundToken, 
+        unexpectedBetweenPoundTokenAndMacro, 
+        macro: macro, 
+        unexpectedBetweenMacroAndGenericArguments, 
+        genericArguments: genericArguments, 
+        unexpectedBetweenGenericArgumentsAndLeftParen, 
+        leftParen: leftParen, 
+        unexpectedBetweenLeftParenAndArgumentList, 
+        argumentList: argumentList, 
+        unexpectedBetweenArgumentListAndRightParen, 
+        rightParen: rightParen, 
+        unexpectedBetweenRightParenAndTrailingClosure, 
+        trailingClosure: trailingClosure, 
+        unexpectedBetweenTrailingClosureAndAdditionalTrailingClosures, 
+        additionalTrailingClosures: additionalTrailingClosures, 
+        unexpectedAfterAdditionalTrailingClosures, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension MemberAccessExprSyntax {
+  @available(*, deprecated, renamed: "unexpectedBetweenBaseAndPeriod")
+  public var unexpectedBetweenBaseAndDot: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenBaseAndPeriod
+    }
+    set {
+      unexpectedBetweenBaseAndPeriod = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "period")
+  public var dot: TokenSyntax {
+    get {
+      return period
+    }
+    set {
+      period = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenPeriodAndName")
+  public var unexpectedBetweenDotAndName: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenPeriodAndName
+    }
+    set {
+      unexpectedBetweenPeriodAndName = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with period argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeBase: UnexpectedNodesSyntax? = nil,
+      base: (some ExprSyntaxProtocol)? = ExprSyntax?.none,
+      _ unexpectedBetweenBaseAndDot: UnexpectedNodesSyntax? = nil,
+      dot: TokenSyntax = .periodToken(),
+      _ unexpectedBetweenDotAndName: UnexpectedNodesSyntax? = nil,
+      name: TokenSyntax,
+      _ unexpectedBetweenNameAndDeclNameArguments: UnexpectedNodesSyntax? = nil,
+      declNameArguments: DeclNameArgumentsSyntax? = nil,
+      _ unexpectedAfterDeclNameArguments: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeBase, 
+        base: base, 
+        unexpectedBetweenBaseAndDot, 
+        period: dot, 
+        unexpectedBetweenDotAndName, 
+        name: name, 
+        unexpectedBetweenNameAndDeclNameArguments, 
+        declNameArguments: declNameArguments, 
+        unexpectedAfterDeclNameArguments, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension NamedOpaqueReturnTypeSyntax {
+  @available(*, deprecated, renamed: "unexpectedBeforeGenericParameterClause")
+  public var unexpectedBeforeGenericParameters: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBeforeGenericParameterClause
+    }
+    set {
+      unexpectedBeforeGenericParameterClause = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "genericParameterClause")
+  public var genericParameters: GenericParameterClauseSyntax {
+    get {
+      return genericParameterClause
+    }
+    set {
+      genericParameterClause = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenGenericParameterClauseAndBaseType")
+  public var unexpectedBetweenGenericParametersAndBaseType: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenGenericParameterClauseAndBaseType
+    }
+    set {
+      unexpectedBetweenGenericParameterClauseAndBaseType = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with genericParameterClause argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeGenericParameters: UnexpectedNodesSyntax? = nil,
+      genericParameters: GenericParameterClauseSyntax,
+      _ unexpectedBetweenGenericParametersAndBaseType: UnexpectedNodesSyntax? = nil,
+      baseType: some TypeSyntaxProtocol,
+      _ unexpectedAfterBaseType: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeGenericParameters, 
+        genericParameterClause: genericParameters, 
+        unexpectedBetweenGenericParametersAndBaseType, 
+        baseType: baseType, 
+        unexpectedAfterBaseType, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension PostfixUnaryExprSyntax {
+  @available(*, deprecated, renamed: "unexpectedBetweenExpressionAndOperator")
+  public var unexpectedBetweenExpressionAndOperatorToken: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenExpressionAndOperator
+    }
+    set {
+      unexpectedBetweenExpressionAndOperator = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "operator")
+  public var operatorToken: TokenSyntax {
+    get {
+      return `operator`
+    }
+    set {
+      `operator` = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedAfterOperator")
+  public var unexpectedAfterOperatorToken: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedAfterOperator
+    }
+    set {
+      unexpectedAfterOperator = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with operator argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeExpression: UnexpectedNodesSyntax? = nil,
+      expression: some ExprSyntaxProtocol,
+      _ unexpectedBetweenExpressionAndOperatorToken: UnexpectedNodesSyntax? = nil,
+      operatorToken: TokenSyntax,
+      _ unexpectedAfterOperatorToken: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeExpression, 
+        expression: expression, 
+        unexpectedBetweenExpressionAndOperatorToken, 
+        operator: operatorToken, 
+        unexpectedAfterOperatorToken, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension PoundSourceLocationArgsSyntax {
+  @available(*, deprecated, renamed: "unexpectedBeforeFileLabel")
+  public var unexpectedBeforeFileArgLabel: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBeforeFileLabel
+    }
+    set {
+      unexpectedBeforeFileLabel = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "fileLabel")
+  public var fileArgLabel: TokenSyntax {
+    get {
+      return fileLabel
+    }
+    set {
+      fileLabel = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenFileLabelAndFileColon")
+  public var unexpectedBetweenFileArgLabelAndFileArgColon: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenFileLabelAndFileColon
+    }
+    set {
+      unexpectedBetweenFileLabelAndFileColon = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "fileColon")
+  public var fileArgColon: TokenSyntax {
+    get {
+      return fileColon
+    }
+    set {
+      fileColon = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenFileColonAndFileName")
+  public var unexpectedBetweenFileArgColonAndFileName: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenFileColonAndFileName
+    }
+    set {
+      unexpectedBetweenFileColonAndFileName = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenCommaAndLineLabel")
+  public var unexpectedBetweenCommaAndLineArgLabel: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenCommaAndLineLabel
+    }
+    set {
+      unexpectedBetweenCommaAndLineLabel = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "lineLabel")
+  public var lineArgLabel: TokenSyntax {
+    get {
+      return lineLabel
+    }
+    set {
+      lineLabel = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenLineLabelAndLineColon")
+  public var unexpectedBetweenLineArgLabelAndLineArgColon: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenLineLabelAndLineColon
+    }
+    set {
+      unexpectedBetweenLineLabelAndLineColon = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "lineColon")
+  public var lineArgColon: TokenSyntax {
+    get {
+      return lineColon
+    }
+    set {
+      lineColon = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenLineColonAndLineNumber")
+  public var unexpectedBetweenLineArgColonAndLineNumber: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenLineColonAndLineNumber
+    }
+    set {
+      unexpectedBetweenLineColonAndLineNumber = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with fileLabel, fileColon, lineLabel, lineColon argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeFileArgLabel: UnexpectedNodesSyntax? = nil,
+      fileArgLabel: TokenSyntax = .keyword(.file),
+      _ unexpectedBetweenFileArgLabelAndFileArgColon: UnexpectedNodesSyntax? = nil,
+      fileArgColon: TokenSyntax = .colonToken(),
+      _ unexpectedBetweenFileArgColonAndFileName: UnexpectedNodesSyntax? = nil,
+      fileName: StringLiteralExprSyntax,
+      _ unexpectedBetweenFileNameAndComma: UnexpectedNodesSyntax? = nil,
+      comma: TokenSyntax = .commaToken(),
+      _ unexpectedBetweenCommaAndLineArgLabel: UnexpectedNodesSyntax? = nil,
+      lineArgLabel: TokenSyntax = .keyword(.line),
+      _ unexpectedBetweenLineArgLabelAndLineArgColon: UnexpectedNodesSyntax? = nil,
+      lineArgColon: TokenSyntax = .colonToken(),
+      _ unexpectedBetweenLineArgColonAndLineNumber: UnexpectedNodesSyntax? = nil,
+      lineNumber: TokenSyntax,
+      _ unexpectedAfterLineNumber: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeFileArgLabel, 
+        fileLabel: fileArgLabel, 
+        unexpectedBetweenFileArgLabelAndFileArgColon, 
+        fileColon: fileArgColon, 
+        unexpectedBetweenFileArgColonAndFileName, 
+        fileName: fileName, 
+        unexpectedBetweenFileNameAndComma, 
+        comma: comma, 
+        unexpectedBetweenCommaAndLineArgLabel, 
+        lineLabel: lineArgLabel, 
+        unexpectedBetweenLineArgLabelAndLineArgColon, 
+        lineColon: lineArgColon, 
+        unexpectedBetweenLineArgColonAndLineNumber, 
+        lineNumber: lineNumber, 
+        unexpectedAfterLineNumber, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension PrecedenceGroupAssignmentSyntax {
+  @available(*, deprecated, renamed: "unexpectedBeforeAssignmentLabel")
+  public var unexpectedBeforeAssignmentKeyword: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBeforeAssignmentLabel
+    }
+    set {
+      unexpectedBeforeAssignmentLabel = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "assignmentLabel")
+  public var assignmentKeyword: TokenSyntax {
+    get {
+      return assignmentLabel
+    }
+    set {
+      assignmentLabel = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenAssignmentLabelAndColon")
+  public var unexpectedBetweenAssignmentKeywordAndColon: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenAssignmentLabelAndColon
+    }
+    set {
+      unexpectedBetweenAssignmentLabelAndColon = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with assignmentLabel argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeAssignmentKeyword: UnexpectedNodesSyntax? = nil,
+      assignmentKeyword: TokenSyntax = .keyword(.assignment),
+      _ unexpectedBetweenAssignmentKeywordAndColon: UnexpectedNodesSyntax? = nil,
+      colon: TokenSyntax = .colonToken(),
+      _ unexpectedBetweenColonAndFlag: UnexpectedNodesSyntax? = nil,
+      flag: TokenSyntax,
+      _ unexpectedAfterFlag: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeAssignmentKeyword, 
+        assignmentLabel: assignmentKeyword, 
+        unexpectedBetweenAssignmentKeywordAndColon, 
+        colon: colon, 
+        unexpectedBetweenColonAndFlag, 
+        flag: flag, 
+        unexpectedAfterFlag, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension PrecedenceGroupAssociativitySyntax {
+  @available(*, deprecated, renamed: "unexpectedBeforeAssociativityLabel")
+  public var unexpectedBeforeAssociativityKeyword: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBeforeAssociativityLabel
+    }
+    set {
+      unexpectedBeforeAssociativityLabel = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "associativityLabel")
+  public var associativityKeyword: TokenSyntax {
+    get {
+      return associativityLabel
+    }
+    set {
+      associativityLabel = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenAssociativityLabelAndColon")
+  public var unexpectedBetweenAssociativityKeywordAndColon: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenAssociativityLabelAndColon
+    }
+    set {
+      unexpectedBetweenAssociativityLabelAndColon = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with associativityLabel argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeAssociativityKeyword: UnexpectedNodesSyntax? = nil,
+      associativityKeyword: TokenSyntax = .keyword(.associativity),
+      _ unexpectedBetweenAssociativityKeywordAndColon: UnexpectedNodesSyntax? = nil,
+      colon: TokenSyntax = .colonToken(),
+      _ unexpectedBetweenColonAndValue: UnexpectedNodesSyntax? = nil,
+      value: TokenSyntax,
+      _ unexpectedAfterValue: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeAssociativityKeyword, 
+        associativityLabel: associativityKeyword, 
+        unexpectedBetweenAssociativityKeywordAndColon, 
+        colon: colon, 
+        unexpectedBetweenColonAndValue, 
+        value: value, 
+        unexpectedAfterValue, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension PrecedenceGroupRelationSyntax {
+  @available(*, deprecated, renamed: "unexpectedBeforeHigherThanOrLowerThanKeyword")
+  public var unexpectedBeforeHigherThanOrLowerThan: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBeforeHigherThanOrLowerThanKeyword
+    }
+    set {
+      unexpectedBeforeHigherThanOrLowerThanKeyword = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "higherThanOrLowerThanKeyword")
+  public var higherThanOrLowerThan: TokenSyntax {
+    get {
+      return higherThanOrLowerThanKeyword
+    }
+    set {
+      higherThanOrLowerThanKeyword = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenHigherThanOrLowerThanKeywordAndColon")
+  public var unexpectedBetweenHigherThanOrLowerThanAndColon: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenHigherThanOrLowerThanKeywordAndColon
+    }
+    set {
+      unexpectedBetweenHigherThanOrLowerThanKeywordAndColon = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with higherThanOrLowerThanKeyword argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeHigherThanOrLowerThan: UnexpectedNodesSyntax? = nil,
+      higherThanOrLowerThan: TokenSyntax,
+      _ unexpectedBetweenHigherThanOrLowerThanAndColon: UnexpectedNodesSyntax? = nil,
+      colon: TokenSyntax = .colonToken(),
+      _ unexpectedBetweenColonAndOtherNames: UnexpectedNodesSyntax? = nil,
+      otherNames: PrecedenceGroupNameListSyntax,
+      _ unexpectedAfterOtherNames: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeHigherThanOrLowerThan, 
+        higherThanOrLowerThanKeyword: higherThanOrLowerThan, 
+        unexpectedBetweenHigherThanOrLowerThanAndColon, 
+        colon: colon, 
+        unexpectedBetweenColonAndOtherNames, 
+        otherNames: otherNames, 
+        unexpectedAfterOtherNames, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension PrefixOperatorExprSyntax {
+  @available(*, deprecated, renamed: "unexpectedBeforeOperator")
+  public var unexpectedBeforeOperatorToken: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBeforeOperator
+    }
+    set {
+      unexpectedBeforeOperator = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "operator")
+  public var operatorToken: TokenSyntax? {
+    get {
+      return `operator`
+    }
+    set {
+      `operator` = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenOperatorAndPostfixExpression")
+  public var unexpectedBetweenOperatorTokenAndPostfixExpression: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenOperatorAndPostfixExpression
+    }
+    set {
+      unexpectedBetweenOperatorAndPostfixExpression = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with operator argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeOperatorToken: UnexpectedNodesSyntax? = nil,
+      operatorToken: TokenSyntax? = nil,
+      _ unexpectedBetweenOperatorTokenAndPostfixExpression: UnexpectedNodesSyntax? = nil,
+      postfixExpression: some ExprSyntaxProtocol,
+      _ unexpectedAfterPostfixExpression: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeOperatorToken, 
+        operator: operatorToken, 
+        unexpectedBetweenOperatorTokenAndPostfixExpression, 
+        postfixExpression: postfixExpression, 
+        unexpectedAfterPostfixExpression, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension PrimaryAssociatedTypeClauseSyntax {
+  @available(*, deprecated, renamed: "unexpectedBeforeLeftAngle")
+  public var unexpectedBeforeLeftAngleBracket: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBeforeLeftAngle
+    }
+    set {
+      unexpectedBeforeLeftAngle = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "leftAngle")
+  public var leftAngleBracket: TokenSyntax {
+    get {
+      return leftAngle
+    }
+    set {
+      leftAngle = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenLeftAngleAndPrimaryAssociatedTypeList")
+  public var unexpectedBetweenLeftAngleBracketAndPrimaryAssociatedTypeList: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenLeftAngleAndPrimaryAssociatedTypeList
+    }
+    set {
+      unexpectedBetweenLeftAngleAndPrimaryAssociatedTypeList = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenPrimaryAssociatedTypeListAndRightAngle")
+  public var unexpectedBetweenPrimaryAssociatedTypeListAndRightAngleBracket: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenPrimaryAssociatedTypeListAndRightAngle
+    }
+    set {
+      unexpectedBetweenPrimaryAssociatedTypeListAndRightAngle = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "rightAngle")
+  public var rightAngleBracket: TokenSyntax {
+    get {
+      return rightAngle
+    }
+    set {
+      rightAngle = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedAfterRightAngle")
+  public var unexpectedAfterRightAngleBracket: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedAfterRightAngle
+    }
+    set {
+      unexpectedAfterRightAngle = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with leftAngle, rightAngle argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeLeftAngleBracket: UnexpectedNodesSyntax? = nil,
+      leftAngleBracket: TokenSyntax = .leftAngleToken(),
+      _ unexpectedBetweenLeftAngleBracketAndPrimaryAssociatedTypeList: UnexpectedNodesSyntax? = nil,
+      primaryAssociatedTypeList: PrimaryAssociatedTypeListSyntax,
+      _ unexpectedBetweenPrimaryAssociatedTypeListAndRightAngleBracket: UnexpectedNodesSyntax? = nil,
+      rightAngleBracket: TokenSyntax = .rightAngleToken(),
+      _ unexpectedAfterRightAngleBracket: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeLeftAngleBracket, 
+        leftAngle: leftAngleBracket, 
+        unexpectedBetweenLeftAngleBracketAndPrimaryAssociatedTypeList, 
+        primaryAssociatedTypeList: primaryAssociatedTypeList, 
+        unexpectedBetweenPrimaryAssociatedTypeListAndRightAngleBracket, 
+        rightAngle: rightAngleBracket, 
+        unexpectedAfterRightAngleBracket, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension QualifiedDeclNameSyntax {
+  @available(*, deprecated, renamed: "unexpectedBetweenBaseTypeAndPeriod")
+  public var unexpectedBetweenBaseTypeAndDot: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenBaseTypeAndPeriod
+    }
+    set {
+      unexpectedBetweenBaseTypeAndPeriod = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "period")
+  public var dot: TokenSyntax? {
+    get {
+      return period
+    }
+    set {
+      period = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenPeriodAndName")
+  public var unexpectedBetweenDotAndName: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenPeriodAndName
+    }
+    set {
+      unexpectedBetweenPeriodAndName = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with period argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeBaseType: UnexpectedNodesSyntax? = nil,
+      baseType: (some TypeSyntaxProtocol)? = TypeSyntax?.none,
+      _ unexpectedBetweenBaseTypeAndDot: UnexpectedNodesSyntax? = nil,
+      dot: TokenSyntax? = nil,
+      _ unexpectedBetweenDotAndName: UnexpectedNodesSyntax? = nil,
+      name: TokenSyntax,
+      _ unexpectedBetweenNameAndArguments: UnexpectedNodesSyntax? = nil,
+      arguments: DeclNameArgumentsSyntax? = nil,
+      _ unexpectedAfterArguments: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeBaseType, 
+        baseType: baseType, 
+        unexpectedBetweenBaseTypeAndDot, 
+        period: dot, 
+        unexpectedBetweenDotAndName, 
+        name: name, 
+        unexpectedBetweenNameAndArguments, 
+        arguments: arguments, 
+        unexpectedAfterArguments, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension SourceFileSyntax {
+  @available(*, deprecated, renamed: "unexpectedBetweenStatementsAndEndOfFileToken")
+  public var unexpectedBetweenStatementsAndEOFToken: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenStatementsAndEndOfFileToken
+    }
+    set {
+      unexpectedBetweenStatementsAndEndOfFileToken = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "endOfFileToken")
+  public var eofToken: TokenSyntax {
+    get {
+      return endOfFileToken
+    }
+    set {
+      endOfFileToken = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedAfterEndOfFileToken")
+  public var unexpectedAfterEOFToken: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedAfterEndOfFileToken
+    }
+    set {
+      unexpectedAfterEndOfFileToken = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with endOfFileToken argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeStatements: UnexpectedNodesSyntax? = nil,
+      statements: CodeBlockItemListSyntax,
+      _ unexpectedBetweenStatementsAndEOFToken: UnexpectedNodesSyntax? = nil,
+      eofToken: TokenSyntax = .eof(),
+      _ unexpectedAfterEOFToken: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeStatements, 
+        statements: statements, 
+        unexpectedBetweenStatementsAndEOFToken, 
+        endOfFileToken: eofToken, 
+        unexpectedAfterEOFToken, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension SubscriptExprSyntax {
+  @available(*, deprecated, renamed: "unexpectedBetweenCalledExpressionAndLeftSquare")
+  public var unexpectedBetweenCalledExpressionAndLeftBracket: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenCalledExpressionAndLeftSquare
+    }
+    set {
+      unexpectedBetweenCalledExpressionAndLeftSquare = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "leftSquare")
+  public var leftBracket: TokenSyntax {
+    get {
+      return leftSquare
+    }
+    set {
+      leftSquare = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenLeftSquareAndArgumentList")
+  public var unexpectedBetweenLeftBracketAndArgumentList: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenLeftSquareAndArgumentList
+    }
+    set {
+      unexpectedBetweenLeftSquareAndArgumentList = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenArgumentListAndRightSquare")
+  public var unexpectedBetweenArgumentListAndRightBracket: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenArgumentListAndRightSquare
+    }
+    set {
+      unexpectedBetweenArgumentListAndRightSquare = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "rightSquare")
+  public var rightBracket: TokenSyntax {
+    get {
+      return rightSquare
+    }
+    set {
+      rightSquare = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenRightSquareAndTrailingClosure")
+  public var unexpectedBetweenRightBracketAndTrailingClosure: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenRightSquareAndTrailingClosure
+    }
+    set {
+      unexpectedBetweenRightSquareAndTrailingClosure = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with leftSquare, rightSquare argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeCalledExpression: UnexpectedNodesSyntax? = nil,
+      calledExpression: some ExprSyntaxProtocol,
+      _ unexpectedBetweenCalledExpressionAndLeftBracket: UnexpectedNodesSyntax? = nil,
+      leftBracket: TokenSyntax = .leftSquareToken(),
+      _ unexpectedBetweenLeftBracketAndArgumentList: UnexpectedNodesSyntax? = nil,
+      argumentList: TupleExprElementListSyntax,
+      _ unexpectedBetweenArgumentListAndRightBracket: UnexpectedNodesSyntax? = nil,
+      rightBracket: TokenSyntax = .rightSquareToken(),
+      _ unexpectedBetweenRightBracketAndTrailingClosure: UnexpectedNodesSyntax? = nil,
+      trailingClosure: ClosureExprSyntax? = nil,
+      _ unexpectedBetweenTrailingClosureAndAdditionalTrailingClosures: UnexpectedNodesSyntax? = nil,
+      additionalTrailingClosures: MultipleTrailingClosureElementListSyntax? = nil,
+      _ unexpectedAfterAdditionalTrailingClosures: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeCalledExpression, 
+        calledExpression: calledExpression, 
+        unexpectedBetweenCalledExpressionAndLeftBracket, 
+        leftSquare: leftBracket, 
+        unexpectedBetweenLeftBracketAndArgumentList, 
+        argumentList: argumentList, 
+        unexpectedBetweenArgumentListAndRightBracket, 
+        rightSquare: rightBracket, 
+        unexpectedBetweenRightBracketAndTrailingClosure, 
+        trailingClosure: trailingClosure, 
+        unexpectedBetweenTrailingClosureAndAdditionalTrailingClosures, 
+        additionalTrailingClosures: additionalTrailingClosures, 
+        unexpectedAfterAdditionalTrailingClosures, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension TargetFunctionEntrySyntax {
+  @available(*, deprecated, renamed: "unexpectedBeforeTargetLabel")
+  public var unexpectedBeforeLabel: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBeforeTargetLabel
+    }
+    set {
+      unexpectedBeforeTargetLabel = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "targetLabel")
+  public var label: TokenSyntax {
+    get {
+      return targetLabel
+    }
+    set {
+      targetLabel = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenTargetLabelAndColon")
+  public var unexpectedBetweenLabelAndColon: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenTargetLabelAndColon
+    }
+    set {
+      unexpectedBetweenTargetLabelAndColon = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with targetLabel argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeLabel: UnexpectedNodesSyntax? = nil,
+      label: TokenSyntax = .keyword(.target),
+      _ unexpectedBetweenLabelAndColon: UnexpectedNodesSyntax? = nil,
+      colon: TokenSyntax = .colonToken(),
+      _ unexpectedBetweenColonAndDeclname: UnexpectedNodesSyntax? = nil,
+      declname: DeclNameSyntax,
+      _ unexpectedBetweenDeclnameAndTrailingComma: UnexpectedNodesSyntax? = nil,
+      trailingComma: TokenSyntax? = nil,
+      _ unexpectedAfterTrailingComma: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeLabel, 
+        targetLabel: label, 
+        unexpectedBetweenLabelAndColon, 
+        colon: colon, 
+        unexpectedBetweenColonAndDeclname, 
+        declname: declname, 
+        unexpectedBetweenDeclnameAndTrailingComma, 
+        trailingComma: trailingComma, 
+        unexpectedAfterTrailingComma, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension TernaryExprSyntax {
+  @available(*, deprecated, renamed: "unexpectedBetweenFirstChoiceAndColon")
+  public var unexpectedBetweenFirstChoiceAndColonMark: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenFirstChoiceAndColon
+    }
+    set {
+      unexpectedBetweenFirstChoiceAndColon = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "colon")
+  public var colonMark: TokenSyntax {
+    get {
+      return colon
+    }
+    set {
+      colon = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenColonAndSecondChoice")
+  public var unexpectedBetweenColonMarkAndSecondChoice: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenColonAndSecondChoice
+    }
+    set {
+      unexpectedBetweenColonAndSecondChoice = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with colon argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeConditionExpression: UnexpectedNodesSyntax? = nil,
+      conditionExpression: some ExprSyntaxProtocol,
+      _ unexpectedBetweenConditionExpressionAndQuestionMark: UnexpectedNodesSyntax? = nil,
+      questionMark: TokenSyntax = .infixQuestionMarkToken(),
+      _ unexpectedBetweenQuestionMarkAndFirstChoice: UnexpectedNodesSyntax? = nil,
+      firstChoice: some ExprSyntaxProtocol,
+      _ unexpectedBetweenFirstChoiceAndColonMark: UnexpectedNodesSyntax? = nil,
+      colonMark: TokenSyntax = .colonToken(),
+      _ unexpectedBetweenColonMarkAndSecondChoice: UnexpectedNodesSyntax? = nil,
+      secondChoice: some ExprSyntaxProtocol,
+      _ unexpectedAfterSecondChoice: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeConditionExpression, 
+        conditionExpression: conditionExpression, 
+        unexpectedBetweenConditionExpressionAndQuestionMark, 
+        questionMark: questionMark, 
+        unexpectedBetweenQuestionMarkAndFirstChoice, 
+        firstChoice: firstChoice, 
+        unexpectedBetweenFirstChoiceAndColonMark, 
+        colon: colonMark, 
+        unexpectedBetweenColonMarkAndSecondChoice, 
+        secondChoice: secondChoice, 
+        unexpectedAfterSecondChoice, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension TupleExprSyntax {
+  @available(*, deprecated, renamed: "unexpectedBetweenLeftParenAndElements")
+  public var unexpectedBetweenLeftParenAndElementList: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenLeftParenAndElements
+    }
+    set {
+      unexpectedBetweenLeftParenAndElements = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "elements")
+  public var elementList: TupleExprElementListSyntax {
     get {
       return elements
     }
@@ -972,7 +3077,7 @@ extension TupleExprSyntax {
     }
   }
   
-  @available(*, deprecated, message: "Use an initializer with elementList argument(s).")
+  @available(*, deprecated, message: "Use an initializer with elements argument(s).")
   @_disfavoredOverload
   public init(
       leadingTrivia: Trivia? = nil,
@@ -999,3 +3104,330 @@ extension TupleExprSyntax {
       )
   }
 }
+
+extension TuplePatternElementSyntax {
+  @available(*, deprecated, renamed: "unexpectedBeforeLabel")
+  public var unexpectedBeforeLabelName: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBeforeLabel
+    }
+    set {
+      unexpectedBeforeLabel = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "label")
+  public var labelName: TokenSyntax? {
+    get {
+      return label
+    }
+    set {
+      label = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenLabelAndColon")
+  public var unexpectedBetweenLabelNameAndLabelColon: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenLabelAndColon
+    }
+    set {
+      unexpectedBetweenLabelAndColon = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "colon")
+  public var labelColon: TokenSyntax? {
+    get {
+      return colon
+    }
+    set {
+      colon = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenColonAndPattern")
+  public var unexpectedBetweenLabelColonAndPattern: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenColonAndPattern
+    }
+    set {
+      unexpectedBetweenColonAndPattern = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with label, colon argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeLabelName: UnexpectedNodesSyntax? = nil,
+      labelName: TokenSyntax? = nil,
+      _ unexpectedBetweenLabelNameAndLabelColon: UnexpectedNodesSyntax? = nil,
+      labelColon: TokenSyntax? = nil,
+      _ unexpectedBetweenLabelColonAndPattern: UnexpectedNodesSyntax? = nil,
+      pattern: some PatternSyntaxProtocol,
+      _ unexpectedBetweenPatternAndTrailingComma: UnexpectedNodesSyntax? = nil,
+      trailingComma: TokenSyntax? = nil,
+      _ unexpectedAfterTrailingComma: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeLabelName, 
+        label: labelName, 
+        unexpectedBetweenLabelNameAndLabelColon, 
+        colon: labelColon, 
+        unexpectedBetweenLabelColonAndPattern, 
+        pattern: pattern, 
+        unexpectedBetweenPatternAndTrailingComma, 
+        trailingComma: trailingComma, 
+        unexpectedAfterTrailingComma, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension TupleTypeElementSyntax {
+  @available(*, deprecated, renamed: "unexpectedBeforeInoutKeyword")
+  public var unexpectedBeforeInOut: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBeforeInoutKeyword
+    }
+    set {
+      unexpectedBeforeInoutKeyword = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "inoutKeyword")
+  public var inOut: TokenSyntax? {
+    get {
+      return inoutKeyword
+    }
+    set {
+      inoutKeyword = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenInoutKeywordAndName")
+  public var unexpectedBetweenInOutAndName: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenInoutKeywordAndName
+    }
+    set {
+      unexpectedBetweenInoutKeywordAndName = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with inoutKeyword argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeInOut: UnexpectedNodesSyntax? = nil,
+      inOut: TokenSyntax? = nil,
+      _ unexpectedBetweenInOutAndName: UnexpectedNodesSyntax? = nil,
+      name: TokenSyntax? = nil,
+      _ unexpectedBetweenNameAndSecondName: UnexpectedNodesSyntax? = nil,
+      secondName: TokenSyntax? = nil,
+      _ unexpectedBetweenSecondNameAndColon: UnexpectedNodesSyntax? = nil,
+      colon: TokenSyntax? = nil,
+      _ unexpectedBetweenColonAndType: UnexpectedNodesSyntax? = nil,
+      type: some TypeSyntaxProtocol,
+      _ unexpectedBetweenTypeAndEllipsis: UnexpectedNodesSyntax? = nil,
+      ellipsis: TokenSyntax? = nil,
+      _ unexpectedBetweenEllipsisAndInitializer: UnexpectedNodesSyntax? = nil,
+      initializer: InitializerClauseSyntax? = nil,
+      _ unexpectedBetweenInitializerAndTrailingComma: UnexpectedNodesSyntax? = nil,
+      trailingComma: TokenSyntax? = nil,
+      _ unexpectedAfterTrailingComma: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeInOut, 
+        inoutKeyword: inOut, 
+        unexpectedBetweenInOutAndName, 
+        name: name, 
+        unexpectedBetweenNameAndSecondName, 
+        secondName: secondName, 
+        unexpectedBetweenSecondNameAndColon, 
+        colon: colon, 
+        unexpectedBetweenColonAndType, 
+        type: type, 
+        unexpectedBetweenTypeAndEllipsis, 
+        ellipsis: ellipsis, 
+        unexpectedBetweenEllipsisAndInitializer, 
+        initializer: initializer, 
+        unexpectedBetweenInitializerAndTrailingComma, 
+        trailingComma: trailingComma, 
+        unexpectedAfterTrailingComma, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension UnresolvedAsExprSyntax {
+  @available(*, deprecated, renamed: "unexpectedBeforeAsKeyword")
+  public var unexpectedBeforeAsTok: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBeforeAsKeyword
+    }
+    set {
+      unexpectedBeforeAsKeyword = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "asKeyword")
+  public var asTok: TokenSyntax {
+    get {
+      return asKeyword
+    }
+    set {
+      asKeyword = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenAsKeywordAndQuestionOrExclamationMark")
+  public var unexpectedBetweenAsTokAndQuestionOrExclamationMark: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenAsKeywordAndQuestionOrExclamationMark
+    }
+    set {
+      unexpectedBetweenAsKeywordAndQuestionOrExclamationMark = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with asKeyword argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeAsTok: UnexpectedNodesSyntax? = nil,
+      asTok: TokenSyntax = .keyword(.as),
+      _ unexpectedBetweenAsTokAndQuestionOrExclamationMark: UnexpectedNodesSyntax? = nil,
+      questionOrExclamationMark: TokenSyntax? = nil,
+      _ unexpectedAfterQuestionOrExclamationMark: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeAsTok, 
+        asKeyword: asTok, 
+        unexpectedBetweenAsTokAndQuestionOrExclamationMark, 
+        questionOrExclamationMark: questionOrExclamationMark, 
+        unexpectedAfterQuestionOrExclamationMark, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension UnresolvedIsExprSyntax {
+  @available(*, deprecated, renamed: "unexpectedBeforeIsKeyword")
+  public var unexpectedBeforeIsTok: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBeforeIsKeyword
+    }
+    set {
+      unexpectedBeforeIsKeyword = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "isKeyword")
+  public var isTok: TokenSyntax {
+    get {
+      return isKeyword
+    }
+    set {
+      isKeyword = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedAfterIsKeyword")
+  public var unexpectedAfterIsTok: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedAfterIsKeyword
+    }
+    set {
+      unexpectedAfterIsKeyword = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with isKeyword argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeIsTok: UnexpectedNodesSyntax? = nil,
+      isTok: TokenSyntax = .keyword(.is),
+      _ unexpectedAfterIsTok: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeIsTok, 
+        isKeyword: isTok, 
+        unexpectedAfterIsTok, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension UnresolvedTernaryExprSyntax {
+  @available(*, deprecated, renamed: "unexpectedBetweenFirstChoiceAndColon")
+  public var unexpectedBetweenFirstChoiceAndColonMark: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenFirstChoiceAndColon
+    }
+    set {
+      unexpectedBetweenFirstChoiceAndColon = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "colon")
+  public var colonMark: TokenSyntax {
+    get {
+      return colon
+    }
+    set {
+      colon = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedAfterColon")
+  public var unexpectedAfterColonMark: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedAfterColon
+    }
+    set {
+      unexpectedAfterColon = newValue
+    }
+  }
+  
+  @available(*, deprecated, message: "Use an initializer with colon argument(s).")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeQuestionMark: UnexpectedNodesSyntax? = nil,
+      questionMark: TokenSyntax = .infixQuestionMarkToken(),
+      _ unexpectedBetweenQuestionMarkAndFirstChoice: UnexpectedNodesSyntax? = nil,
+      firstChoice: some ExprSyntaxProtocol,
+      _ unexpectedBetweenFirstChoiceAndColonMark: UnexpectedNodesSyntax? = nil,
+      colonMark: TokenSyntax = .colonToken(),
+      _ unexpectedAfterColonMark: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeQuestionMark, 
+        questionMark: questionMark, 
+        unexpectedBetweenQuestionMarkAndFirstChoice, 
+        firstChoice: firstChoice, 
+        unexpectedBetweenFirstChoiceAndColonMark, 
+        colon: colonMark, 
+        unexpectedAfterColonMark, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
diff --git a/Sources/SwiftSyntax/generated/raw/RawSyntaxNodes.swift b/Sources/SwiftSyntax/generated/raw/RawSyntaxNodes.swift
index daeb713ac20..9facb8e800a 100644
--- a/Sources/SwiftSyntax/generated/raw/RawSyntaxNodes.swift
+++ b/Sources/SwiftSyntax/generated/raw/RawSyntaxNodes.swift
@@ -1063,9 +1063,9 @@ public struct RawArrowExprSyntax: RawExprSyntaxNodeProtocol {
   public init(
       _ unexpectedBeforeEffectSpecifiers: RawUnexpectedNodesSyntax? = nil, 
       effectSpecifiers: RawTypeEffectSpecifiersSyntax?, 
-      _ unexpectedBetweenEffectSpecifiersAndArrowToken: RawUnexpectedNodesSyntax? = nil, 
-      arrowToken: RawTokenSyntax, 
-      _ unexpectedAfterArrowToken: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBetweenEffectSpecifiersAndArrow: RawUnexpectedNodesSyntax? = nil, 
+      arrow: RawTokenSyntax, 
+      _ unexpectedAfterArrow: RawUnexpectedNodesSyntax? = nil, 
       arena: __shared SyntaxArena
     ) {
     let raw = RawSyntax.makeLayout(
@@ -1073,9 +1073,9 @@ public struct RawArrowExprSyntax: RawExprSyntaxNodeProtocol {
       layout.initialize(repeating: nil)
       layout[0] = unexpectedBeforeEffectSpecifiers?.raw
       layout[1] = effectSpecifiers?.raw
-      layout[2] = unexpectedBetweenEffectSpecifiersAndArrowToken?.raw
-      layout[3] = arrowToken.raw
-      layout[4] = unexpectedAfterArrowToken?.raw
+      layout[2] = unexpectedBetweenEffectSpecifiersAndArrow?.raw
+      layout[3] = arrow.raw
+      layout[4] = unexpectedAfterArrow?.raw
     }
     self.init(unchecked: raw)
   }
@@ -1088,15 +1088,15 @@ public struct RawArrowExprSyntax: RawExprSyntaxNodeProtocol {
     layoutView.children[1].map(RawTypeEffectSpecifiersSyntax.init(raw:))
   }
   
-  public var unexpectedBetweenEffectSpecifiersAndArrowToken: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenEffectSpecifiersAndArrow: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var arrowToken: RawTokenSyntax {
+  public var arrow: RawTokenSyntax {
     layoutView.children[3].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedAfterArrowToken: RawUnexpectedNodesSyntax? {
+  public var unexpectedAfterArrow: RawUnexpectedNodesSyntax? {
     layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
   }
 }
@@ -1133,9 +1133,9 @@ public struct RawAsExprSyntax: RawExprSyntaxNodeProtocol {
   public init(
       _ unexpectedBeforeExpression: RawUnexpectedNodesSyntax? = nil, 
       expression: RawExprSyntax, 
-      _ unexpectedBetweenExpressionAndAsTok: RawUnexpectedNodesSyntax? = nil, 
-      asTok: RawTokenSyntax, 
-      _ unexpectedBetweenAsTokAndQuestionOrExclamationMark: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBetweenExpressionAndAsKeyword: RawUnexpectedNodesSyntax? = nil, 
+      asKeyword: RawTokenSyntax, 
+      _ unexpectedBetweenAsKeywordAndQuestionOrExclamationMark: RawUnexpectedNodesSyntax? = nil, 
       questionOrExclamationMark: RawTokenSyntax?, 
       _ unexpectedBetweenQuestionOrExclamationMarkAndTypeName: RawUnexpectedNodesSyntax? = nil, 
       typeName: RawTypeSyntax, 
@@ -1147,9 +1147,9 @@ public struct RawAsExprSyntax: RawExprSyntaxNodeProtocol {
       layout.initialize(repeating: nil)
       layout[0] = unexpectedBeforeExpression?.raw
       layout[1] = expression.raw
-      layout[2] = unexpectedBetweenExpressionAndAsTok?.raw
-      layout[3] = asTok.raw
-      layout[4] = unexpectedBetweenAsTokAndQuestionOrExclamationMark?.raw
+      layout[2] = unexpectedBetweenExpressionAndAsKeyword?.raw
+      layout[3] = asKeyword.raw
+      layout[4] = unexpectedBetweenAsKeywordAndQuestionOrExclamationMark?.raw
       layout[5] = questionOrExclamationMark?.raw
       layout[6] = unexpectedBetweenQuestionOrExclamationMarkAndTypeName?.raw
       layout[7] = typeName.raw
@@ -1166,15 +1166,15 @@ public struct RawAsExprSyntax: RawExprSyntaxNodeProtocol {
     layoutView.children[1].map(RawExprSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenExpressionAndAsTok: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenExpressionAndAsKeyword: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var asTok: RawTokenSyntax {
+  public var asKeyword: RawTokenSyntax {
     layoutView.children[3].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenAsTokAndQuestionOrExclamationMark: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenAsKeywordAndQuestionOrExclamationMark: RawUnexpectedNodesSyntax? {
     layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
@@ -1225,30 +1225,30 @@ public struct RawAssignmentExprSyntax: RawExprSyntaxNodeProtocol {
   }
   
   public init(
-      _ unexpectedBeforeAssignToken: RawUnexpectedNodesSyntax? = nil, 
-      assignToken: RawTokenSyntax, 
-      _ unexpectedAfterAssignToken: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBeforeEqual: RawUnexpectedNodesSyntax? = nil, 
+      equal: RawTokenSyntax, 
+      _ unexpectedAfterEqual: RawUnexpectedNodesSyntax? = nil, 
       arena: __shared SyntaxArena
     ) {
     let raw = RawSyntax.makeLayout(
       kind: .assignmentExpr, uninitializedCount: 3, arena: arena) { layout in
       layout.initialize(repeating: nil)
-      layout[0] = unexpectedBeforeAssignToken?.raw
-      layout[1] = assignToken.raw
-      layout[2] = unexpectedAfterAssignToken?.raw
+      layout[0] = unexpectedBeforeEqual?.raw
+      layout[1] = equal.raw
+      layout[2] = unexpectedAfterEqual?.raw
     }
     self.init(unchecked: raw)
   }
   
-  public var unexpectedBeforeAssignToken: RawUnexpectedNodesSyntax? {
+  public var unexpectedBeforeEqual: RawUnexpectedNodesSyntax? {
     layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var assignToken: RawTokenSyntax {
+  public var equal: RawTokenSyntax {
     layoutView.children[1].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedAfterAssignToken: RawUnexpectedNodesSyntax? {
+  public var unexpectedAfterEqual: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
 }
@@ -1649,9 +1649,9 @@ public struct RawAttributeSyntax: RawSyntaxNodeProtocol {
   }
   
   public init(
-      _ unexpectedBeforeAtSignToken: RawUnexpectedNodesSyntax? = nil, 
-      atSignToken: RawTokenSyntax, 
-      _ unexpectedBetweenAtSignTokenAndAttributeName: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBeforeAtSign: RawUnexpectedNodesSyntax? = nil, 
+      atSign: RawTokenSyntax, 
+      _ unexpectedBetweenAtSignAndAttributeName: RawUnexpectedNodesSyntax? = nil, 
       attributeName: RawTypeSyntax, 
       _ unexpectedBetweenAttributeNameAndLeftParen: RawUnexpectedNodesSyntax? = nil, 
       leftParen: RawTokenSyntax?, 
@@ -1665,9 +1665,9 @@ public struct RawAttributeSyntax: RawSyntaxNodeProtocol {
     let raw = RawSyntax.makeLayout(
       kind: .attribute, uninitializedCount: 11, arena: arena) { layout in
       layout.initialize(repeating: nil)
-      layout[0] = unexpectedBeforeAtSignToken?.raw
-      layout[1] = atSignToken.raw
-      layout[2] = unexpectedBetweenAtSignTokenAndAttributeName?.raw
+      layout[0] = unexpectedBeforeAtSign?.raw
+      layout[1] = atSign.raw
+      layout[2] = unexpectedBetweenAtSignAndAttributeName?.raw
       layout[3] = attributeName.raw
       layout[4] = unexpectedBetweenAttributeNameAndLeftParen?.raw
       layout[5] = leftParen?.raw
@@ -1680,15 +1680,15 @@ public struct RawAttributeSyntax: RawSyntaxNodeProtocol {
     self.init(unchecked: raw)
   }
   
-  public var unexpectedBeforeAtSignToken: RawUnexpectedNodesSyntax? {
+  public var unexpectedBeforeAtSign: RawUnexpectedNodesSyntax? {
     layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var atSignToken: RawTokenSyntax {
+  public var atSign: RawTokenSyntax {
     layoutView.children[1].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenAtSignTokenAndAttributeName: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenAtSignAndAttributeName: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
@@ -2038,9 +2038,9 @@ public struct RawAvailabilityEntrySyntax: RawSyntaxNodeProtocol {
   }
   
   public init(
-      _ unexpectedBeforeLabel: RawUnexpectedNodesSyntax? = nil, 
-      label: RawTokenSyntax, 
-      _ unexpectedBetweenLabelAndColon: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBeforeAvailabilityLabel: RawUnexpectedNodesSyntax? = nil, 
+      availabilityLabel: RawTokenSyntax, 
+      _ unexpectedBetweenAvailabilityLabelAndColon: RawUnexpectedNodesSyntax? = nil, 
       colon: RawTokenSyntax, 
       _ unexpectedBetweenColonAndAvailabilityArguments: RawUnexpectedNodesSyntax? = nil, 
       availabilityArguments: RawAvailabilitySpecListSyntax, 
@@ -2052,9 +2052,9 @@ public struct RawAvailabilityEntrySyntax: RawSyntaxNodeProtocol {
     let raw = RawSyntax.makeLayout(
       kind: .availabilityEntry, uninitializedCount: 9, arena: arena) { layout in
       layout.initialize(repeating: nil)
-      layout[0] = unexpectedBeforeLabel?.raw
-      layout[1] = label.raw
-      layout[2] = unexpectedBetweenLabelAndColon?.raw
+      layout[0] = unexpectedBeforeAvailabilityLabel?.raw
+      layout[1] = availabilityLabel.raw
+      layout[2] = unexpectedBetweenAvailabilityLabelAndColon?.raw
       layout[3] = colon.raw
       layout[4] = unexpectedBetweenColonAndAvailabilityArguments?.raw
       layout[5] = availabilityArguments.raw
@@ -2065,15 +2065,15 @@ public struct RawAvailabilityEntrySyntax: RawSyntaxNodeProtocol {
     self.init(unchecked: raw)
   }
   
-  public var unexpectedBeforeLabel: RawUnexpectedNodesSyntax? {
+  public var unexpectedBeforeAvailabilityLabel: RawUnexpectedNodesSyntax? {
     layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var label: RawTokenSyntax {
+  public var availabilityLabel: RawTokenSyntax {
     layoutView.children[1].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenLabelAndColon: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenAvailabilityLabelAndColon: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
@@ -2636,30 +2636,30 @@ public struct RawBinaryOperatorExprSyntax: RawExprSyntaxNodeProtocol {
   }
   
   public init(
-      _ unexpectedBeforeOperatorToken: RawUnexpectedNodesSyntax? = nil, 
-      operatorToken: RawTokenSyntax, 
-      _ unexpectedAfterOperatorToken: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBeforeOperator: RawUnexpectedNodesSyntax? = nil, 
+      operator: RawTokenSyntax, 
+      _ unexpectedAfterOperator: RawUnexpectedNodesSyntax? = nil, 
       arena: __shared SyntaxArena
     ) {
     let raw = RawSyntax.makeLayout(
       kind: .binaryOperatorExpr, uninitializedCount: 3, arena: arena) { layout in
       layout.initialize(repeating: nil)
-      layout[0] = unexpectedBeforeOperatorToken?.raw
-      layout[1] = operatorToken.raw
-      layout[2] = unexpectedAfterOperatorToken?.raw
+      layout[0] = unexpectedBeforeOperator?.raw
+      layout[1] = `operator`.raw
+      layout[2] = unexpectedAfterOperator?.raw
     }
     self.init(unchecked: raw)
   }
   
-  public var unexpectedBeforeOperatorToken: RawUnexpectedNodesSyntax? {
+  public var unexpectedBeforeOperator: RawUnexpectedNodesSyntax? {
     layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var operatorToken: RawTokenSyntax {
+  public var `operator`: RawTokenSyntax {
     layoutView.children[1].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedAfterOperatorToken: RawUnexpectedNodesSyntax? {
+  public var unexpectedAfterOperator: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
 }
@@ -3836,9 +3836,9 @@ public struct RawClosureCaptureItemSyntax: RawSyntaxNodeProtocol {
       specifier: RawClosureCaptureItemSpecifierSyntax?, 
       _ unexpectedBetweenSpecifierAndName: RawUnexpectedNodesSyntax? = nil, 
       name: RawTokenSyntax?, 
-      _ unexpectedBetweenNameAndAssignToken: RawUnexpectedNodesSyntax? = nil, 
-      assignToken: RawTokenSyntax?, 
-      _ unexpectedBetweenAssignTokenAndExpression: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBetweenNameAndEqual: RawUnexpectedNodesSyntax? = nil, 
+      equal: RawTokenSyntax?, 
+      _ unexpectedBetweenEqualAndExpression: RawUnexpectedNodesSyntax? = nil, 
       expression: RawExprSyntax, 
       _ unexpectedBetweenExpressionAndTrailingComma: RawUnexpectedNodesSyntax? = nil, 
       trailingComma: RawTokenSyntax?, 
@@ -3852,9 +3852,9 @@ public struct RawClosureCaptureItemSyntax: RawSyntaxNodeProtocol {
       layout[1] = specifier?.raw
       layout[2] = unexpectedBetweenSpecifierAndName?.raw
       layout[3] = name?.raw
-      layout[4] = unexpectedBetweenNameAndAssignToken?.raw
-      layout[5] = assignToken?.raw
-      layout[6] = unexpectedBetweenAssignTokenAndExpression?.raw
+      layout[4] = unexpectedBetweenNameAndEqual?.raw
+      layout[5] = equal?.raw
+      layout[6] = unexpectedBetweenEqualAndExpression?.raw
       layout[7] = expression.raw
       layout[8] = unexpectedBetweenExpressionAndTrailingComma?.raw
       layout[9] = trailingComma?.raw
@@ -3879,15 +3879,15 @@ public struct RawClosureCaptureItemSyntax: RawSyntaxNodeProtocol {
     layoutView.children[3].map(RawTokenSyntax.init(raw:))
   }
   
-  public var unexpectedBetweenNameAndAssignToken: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenNameAndEqual: RawUnexpectedNodesSyntax? {
     layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var assignToken: RawTokenSyntax? {
+  public var equal: RawTokenSyntax? {
     layoutView.children[5].map(RawTokenSyntax.init(raw:))
   }
   
-  public var unexpectedBetweenAssignTokenAndExpression: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenEqualAndExpression: RawUnexpectedNodesSyntax? {
     layoutView.children[6].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
@@ -4548,9 +4548,9 @@ public struct RawClosureSignatureSyntax: RawSyntaxNodeProtocol {
       effectSpecifiers: RawTypeEffectSpecifiersSyntax?, 
       _ unexpectedBetweenEffectSpecifiersAndOutput: RawUnexpectedNodesSyntax? = nil, 
       output: RawReturnClauseSyntax?, 
-      _ unexpectedBetweenOutputAndInTok: RawUnexpectedNodesSyntax? = nil, 
-      inTok: RawTokenSyntax, 
-      _ unexpectedAfterInTok: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBetweenOutputAndInKeyword: RawUnexpectedNodesSyntax? = nil, 
+      inKeyword: RawTokenSyntax, 
+      _ unexpectedAfterInKeyword: RawUnexpectedNodesSyntax? = nil, 
       arena: __shared SyntaxArena
     ) {
     let raw = RawSyntax.makeLayout(
@@ -4566,9 +4566,9 @@ public struct RawClosureSignatureSyntax: RawSyntaxNodeProtocol {
       layout[7] = effectSpecifiers?.raw
       layout[8] = unexpectedBetweenEffectSpecifiersAndOutput?.raw
       layout[9] = output?.raw
-      layout[10] = unexpectedBetweenOutputAndInTok?.raw
-      layout[11] = inTok.raw
-      layout[12] = unexpectedAfterInTok?.raw
+      layout[10] = unexpectedBetweenOutputAndInKeyword?.raw
+      layout[11] = inKeyword.raw
+      layout[12] = unexpectedAfterInKeyword?.raw
     }
     self.init(unchecked: raw)
   }
@@ -4613,15 +4613,15 @@ public struct RawClosureSignatureSyntax: RawSyntaxNodeProtocol {
     layoutView.children[9].map(RawReturnClauseSyntax.init(raw:))
   }
   
-  public var unexpectedBetweenOutputAndInTok: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenOutputAndInKeyword: RawUnexpectedNodesSyntax? {
     layoutView.children[10].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var inTok: RawTokenSyntax {
+  public var inKeyword: RawTokenSyntax {
     layoutView.children[11].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedAfterInTok: RawUnexpectedNodesSyntax? {
+  public var unexpectedAfterInKeyword: RawUnexpectedNodesSyntax? {
     layoutView.children[12].map(RawUnexpectedNodesSyntax.init(raw:))
   }
 }
@@ -8975,9 +8975,9 @@ public struct RawExpressionSegmentSyntax: RawSyntaxNodeProtocol {
   public init(
       _ unexpectedBeforeBackslash: RawUnexpectedNodesSyntax? = nil, 
       backslash: RawTokenSyntax, 
-      _ unexpectedBetweenBackslashAndDelimiter: RawUnexpectedNodesSyntax? = nil, 
-      delimiter: RawTokenSyntax?, 
-      _ unexpectedBetweenDelimiterAndLeftParen: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBetweenBackslashAndRawStringDelimiter: RawUnexpectedNodesSyntax? = nil, 
+      rawStringDelimiter: RawTokenSyntax?, 
+      _ unexpectedBetweenRawStringDelimiterAndLeftParen: RawUnexpectedNodesSyntax? = nil, 
       leftParen: RawTokenSyntax, 
       _ unexpectedBetweenLeftParenAndExpressions: RawUnexpectedNodesSyntax? = nil, 
       expressions: RawTupleExprElementListSyntax, 
@@ -8991,9 +8991,9 @@ public struct RawExpressionSegmentSyntax: RawSyntaxNodeProtocol {
       layout.initialize(repeating: nil)
       layout[0] = unexpectedBeforeBackslash?.raw
       layout[1] = backslash.raw
-      layout[2] = unexpectedBetweenBackslashAndDelimiter?.raw
-      layout[3] = delimiter?.raw
-      layout[4] = unexpectedBetweenDelimiterAndLeftParen?.raw
+      layout[2] = unexpectedBetweenBackslashAndRawStringDelimiter?.raw
+      layout[3] = rawStringDelimiter?.raw
+      layout[4] = unexpectedBetweenRawStringDelimiterAndLeftParen?.raw
       layout[5] = leftParen.raw
       layout[6] = unexpectedBetweenLeftParenAndExpressions?.raw
       layout[7] = expressions.raw
@@ -9012,15 +9012,15 @@ public struct RawExpressionSegmentSyntax: RawSyntaxNodeProtocol {
     layoutView.children[1].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenBackslashAndDelimiter: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenBackslashAndRawStringDelimiter: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var delimiter: RawTokenSyntax? {
+  public var rawStringDelimiter: RawTokenSyntax? {
     layoutView.children[3].map(RawTokenSyntax.init(raw:))
   }
   
-  public var unexpectedBetweenDelimiterAndLeftParen: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenRawStringDelimiterAndLeftParen: RawUnexpectedNodesSyntax? {
     layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
@@ -9325,30 +9325,30 @@ public struct RawFloatLiteralExprSyntax: RawExprSyntaxNodeProtocol {
   }
   
   public init(
-      _ unexpectedBeforeFloatingDigits: RawUnexpectedNodesSyntax? = nil, 
-      floatingDigits: RawTokenSyntax, 
-      _ unexpectedAfterFloatingDigits: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBeforeDigits: RawUnexpectedNodesSyntax? = nil, 
+      digits: RawTokenSyntax, 
+      _ unexpectedAfterDigits: RawUnexpectedNodesSyntax? = nil, 
       arena: __shared SyntaxArena
     ) {
     let raw = RawSyntax.makeLayout(
       kind: .floatLiteralExpr, uninitializedCount: 3, arena: arena) { layout in
       layout.initialize(repeating: nil)
-      layout[0] = unexpectedBeforeFloatingDigits?.raw
-      layout[1] = floatingDigits.raw
-      layout[2] = unexpectedAfterFloatingDigits?.raw
+      layout[0] = unexpectedBeforeDigits?.raw
+      layout[1] = digits.raw
+      layout[2] = unexpectedAfterDigits?.raw
     }
     self.init(unchecked: raw)
   }
   
-  public var unexpectedBeforeFloatingDigits: RawUnexpectedNodesSyntax? {
+  public var unexpectedBeforeDigits: RawUnexpectedNodesSyntax? {
     layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var floatingDigits: RawTokenSyntax {
+  public var digits: RawTokenSyntax {
     layoutView.children[1].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedAfterFloatingDigits: RawUnexpectedNodesSyntax? {
+  public var unexpectedAfterDigits: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
 }
@@ -10341,38 +10341,38 @@ public struct RawGenericArgumentClauseSyntax: RawSyntaxNodeProtocol {
   }
   
   public init(
-      _ unexpectedBeforeLeftAngleBracket: RawUnexpectedNodesSyntax? = nil, 
-      leftAngleBracket: RawTokenSyntax, 
-      _ unexpectedBetweenLeftAngleBracketAndArguments: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBeforeLeftAngle: RawUnexpectedNodesSyntax? = nil, 
+      leftAngle: RawTokenSyntax, 
+      _ unexpectedBetweenLeftAngleAndArguments: RawUnexpectedNodesSyntax? = nil, 
       arguments: RawGenericArgumentListSyntax, 
-      _ unexpectedBetweenArgumentsAndRightAngleBracket: RawUnexpectedNodesSyntax? = nil, 
-      rightAngleBracket: RawTokenSyntax, 
-      _ unexpectedAfterRightAngleBracket: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBetweenArgumentsAndRightAngle: RawUnexpectedNodesSyntax? = nil, 
+      rightAngle: RawTokenSyntax, 
+      _ unexpectedAfterRightAngle: RawUnexpectedNodesSyntax? = nil, 
       arena: __shared SyntaxArena
     ) {
     let raw = RawSyntax.makeLayout(
       kind: .genericArgumentClause, uninitializedCount: 7, arena: arena) { layout in
       layout.initialize(repeating: nil)
-      layout[0] = unexpectedBeforeLeftAngleBracket?.raw
-      layout[1] = leftAngleBracket.raw
-      layout[2] = unexpectedBetweenLeftAngleBracketAndArguments?.raw
+      layout[0] = unexpectedBeforeLeftAngle?.raw
+      layout[1] = leftAngle.raw
+      layout[2] = unexpectedBetweenLeftAngleAndArguments?.raw
       layout[3] = arguments.raw
-      layout[4] = unexpectedBetweenArgumentsAndRightAngleBracket?.raw
-      layout[5] = rightAngleBracket.raw
-      layout[6] = unexpectedAfterRightAngleBracket?.raw
+      layout[4] = unexpectedBetweenArgumentsAndRightAngle?.raw
+      layout[5] = rightAngle.raw
+      layout[6] = unexpectedAfterRightAngle?.raw
     }
     self.init(unchecked: raw)
   }
   
-  public var unexpectedBeforeLeftAngleBracket: RawUnexpectedNodesSyntax? {
+  public var unexpectedBeforeLeftAngle: RawUnexpectedNodesSyntax? {
     layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var leftAngleBracket: RawTokenSyntax {
+  public var leftAngle: RawTokenSyntax {
     layoutView.children[1].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenLeftAngleBracketAndArguments: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenLeftAngleAndArguments: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
@@ -10380,15 +10380,15 @@ public struct RawGenericArgumentClauseSyntax: RawSyntaxNodeProtocol {
     layoutView.children[3].map(RawGenericArgumentListSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenArgumentsAndRightAngleBracket: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenArgumentsAndRightAngle: RawUnexpectedNodesSyntax? {
     layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var rightAngleBracket: RawTokenSyntax {
+  public var rightAngle: RawTokenSyntax {
     layoutView.children[5].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedAfterRightAngleBracket: RawUnexpectedNodesSyntax? {
+  public var unexpectedAfterRightAngle: RawUnexpectedNodesSyntax? {
     layoutView.children[6].map(RawUnexpectedNodesSyntax.init(raw:))
   }
 }
@@ -10543,42 +10543,42 @@ public struct RawGenericParameterClauseSyntax: RawSyntaxNodeProtocol {
   }
   
   public init(
-      _ unexpectedBeforeLeftAngleBracket: RawUnexpectedNodesSyntax? = nil, 
-      leftAngleBracket: RawTokenSyntax, 
-      _ unexpectedBetweenLeftAngleBracketAndParameters: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBeforeLeftAngle: RawUnexpectedNodesSyntax? = nil, 
+      leftAngle: RawTokenSyntax, 
+      _ unexpectedBetweenLeftAngleAndParameters: RawUnexpectedNodesSyntax? = nil, 
       parameters: RawGenericParameterListSyntax, 
       _ unexpectedBetweenParametersAndGenericWhereClause: RawUnexpectedNodesSyntax? = nil, 
       genericWhereClause: RawGenericWhereClauseSyntax?, 
-      _ unexpectedBetweenGenericWhereClauseAndRightAngleBracket: RawUnexpectedNodesSyntax? = nil, 
-      rightAngleBracket: RawTokenSyntax, 
-      _ unexpectedAfterRightAngleBracket: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBetweenGenericWhereClauseAndRightAngle: RawUnexpectedNodesSyntax? = nil, 
+      rightAngle: RawTokenSyntax, 
+      _ unexpectedAfterRightAngle: RawUnexpectedNodesSyntax? = nil, 
       arena: __shared SyntaxArena
     ) {
     let raw = RawSyntax.makeLayout(
       kind: .genericParameterClause, uninitializedCount: 9, arena: arena) { layout in
       layout.initialize(repeating: nil)
-      layout[0] = unexpectedBeforeLeftAngleBracket?.raw
-      layout[1] = leftAngleBracket.raw
-      layout[2] = unexpectedBetweenLeftAngleBracketAndParameters?.raw
+      layout[0] = unexpectedBeforeLeftAngle?.raw
+      layout[1] = leftAngle.raw
+      layout[2] = unexpectedBetweenLeftAngleAndParameters?.raw
       layout[3] = parameters.raw
       layout[4] = unexpectedBetweenParametersAndGenericWhereClause?.raw
       layout[5] = genericWhereClause?.raw
-      layout[6] = unexpectedBetweenGenericWhereClauseAndRightAngleBracket?.raw
-      layout[7] = rightAngleBracket.raw
-      layout[8] = unexpectedAfterRightAngleBracket?.raw
+      layout[6] = unexpectedBetweenGenericWhereClauseAndRightAngle?.raw
+      layout[7] = rightAngle.raw
+      layout[8] = unexpectedAfterRightAngle?.raw
     }
     self.init(unchecked: raw)
   }
   
-  public var unexpectedBeforeLeftAngleBracket: RawUnexpectedNodesSyntax? {
+  public var unexpectedBeforeLeftAngle: RawUnexpectedNodesSyntax? {
     layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var leftAngleBracket: RawTokenSyntax {
+  public var leftAngle: RawTokenSyntax {
     layoutView.children[1].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenLeftAngleBracketAndParameters: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenLeftAngleAndParameters: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
@@ -10594,15 +10594,15 @@ public struct RawGenericParameterClauseSyntax: RawSyntaxNodeProtocol {
     layoutView.children[5].map(RawGenericWhereClauseSyntax.init(raw:))
   }
   
-  public var unexpectedBetweenGenericWhereClauseAndRightAngleBracket: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenGenericWhereClauseAndRightAngle: RawUnexpectedNodesSyntax? {
     layoutView.children[6].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var rightAngleBracket: RawTokenSyntax {
+  public var rightAngle: RawTokenSyntax {
     layoutView.children[7].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedAfterRightAngleBracket: RawUnexpectedNodesSyntax? {
+  public var unexpectedAfterRightAngle: RawUnexpectedNodesSyntax? {
     layoutView.children[8].map(RawUnexpectedNodesSyntax.init(raw:))
   }
 }
@@ -10689,9 +10689,9 @@ public struct RawGenericParameterSyntax: RawSyntaxNodeProtocol {
   public init(
       _ unexpectedBeforeAttributes: RawUnexpectedNodesSyntax? = nil, 
       attributes: RawAttributeListSyntax?, 
-      _ unexpectedBetweenAttributesAndEach: RawUnexpectedNodesSyntax? = nil, 
-      each: RawTokenSyntax?, 
-      _ unexpectedBetweenEachAndName: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBetweenAttributesAndEachKeyword: RawUnexpectedNodesSyntax? = nil, 
+      eachKeyword: RawTokenSyntax?, 
+      _ unexpectedBetweenEachKeywordAndName: RawUnexpectedNodesSyntax? = nil, 
       name: RawTokenSyntax, 
       _ unexpectedBetweenNameAndColon: RawUnexpectedNodesSyntax? = nil, 
       colon: RawTokenSyntax?, 
@@ -10707,9 +10707,9 @@ public struct RawGenericParameterSyntax: RawSyntaxNodeProtocol {
       layout.initialize(repeating: nil)
       layout[0] = unexpectedBeforeAttributes?.raw
       layout[1] = attributes?.raw
-      layout[2] = unexpectedBetweenAttributesAndEach?.raw
-      layout[3] = each?.raw
-      layout[4] = unexpectedBetweenEachAndName?.raw
+      layout[2] = unexpectedBetweenAttributesAndEachKeyword?.raw
+      layout[3] = eachKeyword?.raw
+      layout[4] = unexpectedBetweenEachKeywordAndName?.raw
       layout[5] = name.raw
       layout[6] = unexpectedBetweenNameAndColon?.raw
       layout[7] = colon?.raw
@@ -10730,15 +10730,15 @@ public struct RawGenericParameterSyntax: RawSyntaxNodeProtocol {
     layoutView.children[1].map(RawAttributeListSyntax.init(raw:))
   }
   
-  public var unexpectedBetweenAttributesAndEach: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenAttributesAndEachKeyword: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var each: RawTokenSyntax? {
+  public var eachKeyword: RawTokenSyntax? {
     layoutView.children[3].map(RawTokenSyntax.init(raw:))
   }
   
-  public var unexpectedBetweenEachAndName: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenEachKeywordAndName: RawUnexpectedNodesSyntax? {
     layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
@@ -11915,9 +11915,9 @@ public struct RawImportPathComponentSyntax: RawSyntaxNodeProtocol {
   public init(
       _ unexpectedBeforeName: RawUnexpectedNodesSyntax? = nil, 
       name: RawTokenSyntax, 
-      _ unexpectedBetweenNameAndTrailingDot: RawUnexpectedNodesSyntax? = nil, 
-      trailingDot: RawTokenSyntax?, 
-      _ unexpectedAfterTrailingDot: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBetweenNameAndTrailingPeriod: RawUnexpectedNodesSyntax? = nil, 
+      trailingPeriod: RawTokenSyntax?, 
+      _ unexpectedAfterTrailingPeriod: RawUnexpectedNodesSyntax? = nil, 
       arena: __shared SyntaxArena
     ) {
     let raw = RawSyntax.makeLayout(
@@ -11925,9 +11925,9 @@ public struct RawImportPathComponentSyntax: RawSyntaxNodeProtocol {
       layout.initialize(repeating: nil)
       layout[0] = unexpectedBeforeName?.raw
       layout[1] = name.raw
-      layout[2] = unexpectedBetweenNameAndTrailingDot?.raw
-      layout[3] = trailingDot?.raw
-      layout[4] = unexpectedAfterTrailingDot?.raw
+      layout[2] = unexpectedBetweenNameAndTrailingPeriod?.raw
+      layout[3] = trailingPeriod?.raw
+      layout[4] = unexpectedAfterTrailingPeriod?.raw
     }
     self.init(unchecked: raw)
   }
@@ -11940,15 +11940,15 @@ public struct RawImportPathComponentSyntax: RawSyntaxNodeProtocol {
     layoutView.children[1].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenNameAndTrailingDot: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenNameAndTrailingPeriod: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var trailingDot: RawTokenSyntax? {
+  public var trailingPeriod: RawTokenSyntax? {
     layoutView.children[3].map(RawTokenSyntax.init(raw:))
   }
   
-  public var unexpectedAfterTrailingDot: RawUnexpectedNodesSyntax? {
+  public var unexpectedAfterTrailingPeriod: RawUnexpectedNodesSyntax? {
     layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
   }
 }
@@ -12671,9 +12671,9 @@ public struct RawIsExprSyntax: RawExprSyntaxNodeProtocol {
   public init(
       _ unexpectedBeforeExpression: RawUnexpectedNodesSyntax? = nil, 
       expression: RawExprSyntax, 
-      _ unexpectedBetweenExpressionAndIsTok: RawUnexpectedNodesSyntax? = nil, 
-      isTok: RawTokenSyntax, 
-      _ unexpectedBetweenIsTokAndTypeName: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBetweenExpressionAndIsKeyword: RawUnexpectedNodesSyntax? = nil, 
+      isKeyword: RawTokenSyntax, 
+      _ unexpectedBetweenIsKeywordAndTypeName: RawUnexpectedNodesSyntax? = nil, 
       typeName: RawTypeSyntax, 
       _ unexpectedAfterTypeName: RawUnexpectedNodesSyntax? = nil, 
       arena: __shared SyntaxArena
@@ -12683,9 +12683,9 @@ public struct RawIsExprSyntax: RawExprSyntaxNodeProtocol {
       layout.initialize(repeating: nil)
       layout[0] = unexpectedBeforeExpression?.raw
       layout[1] = expression.raw
-      layout[2] = unexpectedBetweenExpressionAndIsTok?.raw
-      layout[3] = isTok.raw
-      layout[4] = unexpectedBetweenIsTokAndTypeName?.raw
+      layout[2] = unexpectedBetweenExpressionAndIsKeyword?.raw
+      layout[3] = isKeyword.raw
+      layout[4] = unexpectedBetweenIsKeywordAndTypeName?.raw
       layout[5] = typeName.raw
       layout[6] = unexpectedAfterTypeName?.raw
     }
@@ -12700,15 +12700,15 @@ public struct RawIsExprSyntax: RawExprSyntaxNodeProtocol {
     layoutView.children[1].map(RawExprSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenExpressionAndIsTok: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenExpressionAndIsKeyword: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var isTok: RawTokenSyntax {
+  public var isKeyword: RawTokenSyntax {
     layoutView.children[3].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenIsTokAndTypeName: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenIsKeywordAndTypeName: RawUnexpectedNodesSyntax? {
     layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
@@ -13200,38 +13200,38 @@ public struct RawKeyPathSubscriptComponentSyntax: RawSyntaxNodeProtocol {
   }
   
   public init(
-      _ unexpectedBeforeLeftBracket: RawUnexpectedNodesSyntax? = nil, 
-      leftBracket: RawTokenSyntax, 
-      _ unexpectedBetweenLeftBracketAndArgumentList: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBeforeLeftSquare: RawUnexpectedNodesSyntax? = nil, 
+      leftSquare: RawTokenSyntax, 
+      _ unexpectedBetweenLeftSquareAndArgumentList: RawUnexpectedNodesSyntax? = nil, 
       argumentList: RawTupleExprElementListSyntax, 
-      _ unexpectedBetweenArgumentListAndRightBracket: RawUnexpectedNodesSyntax? = nil, 
-      rightBracket: RawTokenSyntax, 
-      _ unexpectedAfterRightBracket: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBetweenArgumentListAndRightSquare: RawUnexpectedNodesSyntax? = nil, 
+      rightSquare: RawTokenSyntax, 
+      _ unexpectedAfterRightSquare: RawUnexpectedNodesSyntax? = nil, 
       arena: __shared SyntaxArena
     ) {
     let raw = RawSyntax.makeLayout(
       kind: .keyPathSubscriptComponent, uninitializedCount: 7, arena: arena) { layout in
       layout.initialize(repeating: nil)
-      layout[0] = unexpectedBeforeLeftBracket?.raw
-      layout[1] = leftBracket.raw
-      layout[2] = unexpectedBetweenLeftBracketAndArgumentList?.raw
+      layout[0] = unexpectedBeforeLeftSquare?.raw
+      layout[1] = leftSquare.raw
+      layout[2] = unexpectedBetweenLeftSquareAndArgumentList?.raw
       layout[3] = argumentList.raw
-      layout[4] = unexpectedBetweenArgumentListAndRightBracket?.raw
-      layout[5] = rightBracket.raw
-      layout[6] = unexpectedAfterRightBracket?.raw
+      layout[4] = unexpectedBetweenArgumentListAndRightSquare?.raw
+      layout[5] = rightSquare.raw
+      layout[6] = unexpectedAfterRightSquare?.raw
     }
     self.init(unchecked: raw)
   }
   
-  public var unexpectedBeforeLeftBracket: RawUnexpectedNodesSyntax? {
+  public var unexpectedBeforeLeftSquare: RawUnexpectedNodesSyntax? {
     layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var leftBracket: RawTokenSyntax {
+  public var leftSquare: RawTokenSyntax {
     layoutView.children[1].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenLeftBracketAndArgumentList: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenLeftSquareAndArgumentList: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
@@ -13239,15 +13239,15 @@ public struct RawKeyPathSubscriptComponentSyntax: RawSyntaxNodeProtocol {
     layoutView.children[3].map(RawTupleExprElementListSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenArgumentListAndRightBracket: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenArgumentListAndRightSquare: RawUnexpectedNodesSyntax? {
     layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var rightBracket: RawTokenSyntax {
+  public var rightSquare: RawTokenSyntax {
     layoutView.children[5].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedAfterRightBracket: RawUnexpectedNodesSyntax? {
+  public var unexpectedAfterRightSquare: RawUnexpectedNodesSyntax? {
     layoutView.children[6].map(RawUnexpectedNodesSyntax.init(raw:))
   }
 }
@@ -13376,11 +13376,11 @@ public struct RawLabeledStmtSyntax: RawStmtSyntaxNodeProtocol {
   }
   
   public init(
-      _ unexpectedBeforeLabelName: RawUnexpectedNodesSyntax? = nil, 
-      labelName: RawTokenSyntax, 
-      _ unexpectedBetweenLabelNameAndLabelColon: RawUnexpectedNodesSyntax? = nil, 
-      labelColon: RawTokenSyntax, 
-      _ unexpectedBetweenLabelColonAndStatement: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBeforeLabel: RawUnexpectedNodesSyntax? = nil, 
+      label: RawTokenSyntax, 
+      _ unexpectedBetweenLabelAndColon: RawUnexpectedNodesSyntax? = nil, 
+      colon: RawTokenSyntax, 
+      _ unexpectedBetweenColonAndStatement: RawUnexpectedNodesSyntax? = nil, 
       statement: RawStmtSyntax, 
       _ unexpectedAfterStatement: RawUnexpectedNodesSyntax? = nil, 
       arena: __shared SyntaxArena
@@ -13388,34 +13388,34 @@ public struct RawLabeledStmtSyntax: RawStmtSyntaxNodeProtocol {
     let raw = RawSyntax.makeLayout(
       kind: .labeledStmt, uninitializedCount: 7, arena: arena) { layout in
       layout.initialize(repeating: nil)
-      layout[0] = unexpectedBeforeLabelName?.raw
-      layout[1] = labelName.raw
-      layout[2] = unexpectedBetweenLabelNameAndLabelColon?.raw
-      layout[3] = labelColon.raw
-      layout[4] = unexpectedBetweenLabelColonAndStatement?.raw
+      layout[0] = unexpectedBeforeLabel?.raw
+      layout[1] = label.raw
+      layout[2] = unexpectedBetweenLabelAndColon?.raw
+      layout[3] = colon.raw
+      layout[4] = unexpectedBetweenColonAndStatement?.raw
       layout[5] = statement.raw
       layout[6] = unexpectedAfterStatement?.raw
     }
     self.init(unchecked: raw)
   }
   
-  public var unexpectedBeforeLabelName: RawUnexpectedNodesSyntax? {
+  public var unexpectedBeforeLabel: RawUnexpectedNodesSyntax? {
     layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var labelName: RawTokenSyntax {
+  public var label: RawTokenSyntax {
     layoutView.children[1].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenLabelNameAndLabelColon: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenLabelAndColon: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var labelColon: RawTokenSyntax {
+  public var colon: RawTokenSyntax {
     layoutView.children[3].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenLabelColonAndStatement: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenColonAndStatement: RawUnexpectedNodesSyntax? {
     layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
@@ -13746,9 +13746,9 @@ public struct RawMacroExpansionDeclSyntax: RawDeclSyntaxNodeProtocol {
       attributes: RawAttributeListSyntax?, 
       _ unexpectedBetweenAttributesAndModifiers: RawUnexpectedNodesSyntax? = nil, 
       modifiers: RawModifierListSyntax?, 
-      _ unexpectedBetweenModifiersAndPoundToken: RawUnexpectedNodesSyntax? = nil, 
-      poundToken: RawTokenSyntax, 
-      _ unexpectedBetweenPoundTokenAndMacro: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBetweenModifiersAndPound: RawUnexpectedNodesSyntax? = nil, 
+      pound: RawTokenSyntax, 
+      _ unexpectedBetweenPoundAndMacro: RawUnexpectedNodesSyntax? = nil, 
       macro: RawTokenSyntax, 
       _ unexpectedBetweenMacroAndGenericArguments: RawUnexpectedNodesSyntax? = nil, 
       genericArguments: RawGenericArgumentClauseSyntax?, 
@@ -13772,9 +13772,9 @@ public struct RawMacroExpansionDeclSyntax: RawDeclSyntaxNodeProtocol {
       layout[1] = attributes?.raw
       layout[2] = unexpectedBetweenAttributesAndModifiers?.raw
       layout[3] = modifiers?.raw
-      layout[4] = unexpectedBetweenModifiersAndPoundToken?.raw
-      layout[5] = poundToken.raw
-      layout[6] = unexpectedBetweenPoundTokenAndMacro?.raw
+      layout[4] = unexpectedBetweenModifiersAndPound?.raw
+      layout[5] = pound.raw
+      layout[6] = unexpectedBetweenPoundAndMacro?.raw
       layout[7] = macro.raw
       layout[8] = unexpectedBetweenMacroAndGenericArguments?.raw
       layout[9] = genericArguments?.raw
@@ -13809,15 +13809,15 @@ public struct RawMacroExpansionDeclSyntax: RawDeclSyntaxNodeProtocol {
     layoutView.children[3].map(RawModifierListSyntax.init(raw:))
   }
   
-  public var unexpectedBetweenModifiersAndPoundToken: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenModifiersAndPound: RawUnexpectedNodesSyntax? {
     layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var poundToken: RawTokenSyntax {
+  public var pound: RawTokenSyntax {
     layoutView.children[5].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenPoundTokenAndMacro: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenPoundAndMacro: RawUnexpectedNodesSyntax? {
     layoutView.children[6].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
@@ -13908,9 +13908,9 @@ public struct RawMacroExpansionExprSyntax: RawExprSyntaxNodeProtocol {
   }
   
   public init(
-      _ unexpectedBeforePoundToken: RawUnexpectedNodesSyntax? = nil, 
-      poundToken: RawTokenSyntax, 
-      _ unexpectedBetweenPoundTokenAndMacro: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBeforePound: RawUnexpectedNodesSyntax? = nil, 
+      pound: RawTokenSyntax, 
+      _ unexpectedBetweenPoundAndMacro: RawUnexpectedNodesSyntax? = nil, 
       macro: RawTokenSyntax, 
       _ unexpectedBetweenMacroAndGenericArguments: RawUnexpectedNodesSyntax? = nil, 
       genericArguments: RawGenericArgumentClauseSyntax?, 
@@ -13930,9 +13930,9 @@ public struct RawMacroExpansionExprSyntax: RawExprSyntaxNodeProtocol {
     let raw = RawSyntax.makeLayout(
       kind: .macroExpansionExpr, uninitializedCount: 17, arena: arena) { layout in
       layout.initialize(repeating: nil)
-      layout[0] = unexpectedBeforePoundToken?.raw
-      layout[1] = poundToken.raw
-      layout[2] = unexpectedBetweenPoundTokenAndMacro?.raw
+      layout[0] = unexpectedBeforePound?.raw
+      layout[1] = pound.raw
+      layout[2] = unexpectedBetweenPoundAndMacro?.raw
       layout[3] = macro.raw
       layout[4] = unexpectedBetweenMacroAndGenericArguments?.raw
       layout[5] = genericArguments?.raw
@@ -13951,15 +13951,15 @@ public struct RawMacroExpansionExprSyntax: RawExprSyntaxNodeProtocol {
     self.init(unchecked: raw)
   }
   
-  public var unexpectedBeforePoundToken: RawUnexpectedNodesSyntax? {
+  public var unexpectedBeforePound: RawUnexpectedNodesSyntax? {
     layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var poundToken: RawTokenSyntax {
+  public var pound: RawTokenSyntax {
     layoutView.children[1].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenPoundTokenAndMacro: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenPoundAndMacro: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
@@ -14146,9 +14146,9 @@ public struct RawMemberAccessExprSyntax: RawExprSyntaxNodeProtocol {
   public init(
       _ unexpectedBeforeBase: RawUnexpectedNodesSyntax? = nil, 
       base: RawExprSyntax?, 
-      _ unexpectedBetweenBaseAndDot: RawUnexpectedNodesSyntax? = nil, 
-      dot: RawTokenSyntax, 
-      _ unexpectedBetweenDotAndName: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBetweenBaseAndPeriod: RawUnexpectedNodesSyntax? = nil, 
+      period: RawTokenSyntax, 
+      _ unexpectedBetweenPeriodAndName: RawUnexpectedNodesSyntax? = nil, 
       name: RawTokenSyntax, 
       _ unexpectedBetweenNameAndDeclNameArguments: RawUnexpectedNodesSyntax? = nil, 
       declNameArguments: RawDeclNameArgumentsSyntax?, 
@@ -14160,9 +14160,9 @@ public struct RawMemberAccessExprSyntax: RawExprSyntaxNodeProtocol {
       layout.initialize(repeating: nil)
       layout[0] = unexpectedBeforeBase?.raw
       layout[1] = base?.raw
-      layout[2] = unexpectedBetweenBaseAndDot?.raw
-      layout[3] = dot.raw
-      layout[4] = unexpectedBetweenDotAndName?.raw
+      layout[2] = unexpectedBetweenBaseAndPeriod?.raw
+      layout[3] = period.raw
+      layout[4] = unexpectedBetweenPeriodAndName?.raw
       layout[5] = name.raw
       layout[6] = unexpectedBetweenNameAndDeclNameArguments?.raw
       layout[7] = declNameArguments?.raw
@@ -14179,15 +14179,15 @@ public struct RawMemberAccessExprSyntax: RawExprSyntaxNodeProtocol {
     layoutView.children[1].map(RawExprSyntax.init(raw:))
   }
   
-  public var unexpectedBetweenBaseAndDot: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenBaseAndPeriod: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var dot: RawTokenSyntax {
+  public var period: RawTokenSyntax {
     layoutView.children[3].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenDotAndName: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenPeriodAndName: RawUnexpectedNodesSyntax? {
     layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
@@ -16745,9 +16745,9 @@ public struct RawPostfixUnaryExprSyntax: RawExprSyntaxNodeProtocol {
   public init(
       _ unexpectedBeforeExpression: RawUnexpectedNodesSyntax? = nil, 
       expression: RawExprSyntax, 
-      _ unexpectedBetweenExpressionAndOperatorToken: RawUnexpectedNodesSyntax? = nil, 
-      operatorToken: RawTokenSyntax, 
-      _ unexpectedAfterOperatorToken: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBetweenExpressionAndOperator: RawUnexpectedNodesSyntax? = nil, 
+      operator: RawTokenSyntax, 
+      _ unexpectedAfterOperator: RawUnexpectedNodesSyntax? = nil, 
       arena: __shared SyntaxArena
     ) {
     let raw = RawSyntax.makeLayout(
@@ -16755,9 +16755,9 @@ public struct RawPostfixUnaryExprSyntax: RawExprSyntaxNodeProtocol {
       layout.initialize(repeating: nil)
       layout[0] = unexpectedBeforeExpression?.raw
       layout[1] = expression.raw
-      layout[2] = unexpectedBetweenExpressionAndOperatorToken?.raw
-      layout[3] = operatorToken.raw
-      layout[4] = unexpectedAfterOperatorToken?.raw
+      layout[2] = unexpectedBetweenExpressionAndOperator?.raw
+      layout[3] = `operator`.raw
+      layout[4] = unexpectedAfterOperator?.raw
     }
     self.init(unchecked: raw)
   }
@@ -16770,15 +16770,15 @@ public struct RawPostfixUnaryExprSyntax: RawExprSyntaxNodeProtocol {
     layoutView.children[1].map(RawExprSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenExpressionAndOperatorToken: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenExpressionAndOperator: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var operatorToken: RawTokenSyntax {
+  public var `operator`: RawTokenSyntax {
     layoutView.children[3].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedAfterOperatorToken: RawUnexpectedNodesSyntax? {
+  public var unexpectedAfterOperator: RawUnexpectedNodesSyntax? {
     layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
   }
 }
@@ -16813,19 +16813,19 @@ public struct RawPoundSourceLocationArgsSyntax: RawSyntaxNodeProtocol {
   }
   
   public init(
-      _ unexpectedBeforeFileArgLabel: RawUnexpectedNodesSyntax? = nil, 
-      fileArgLabel: RawTokenSyntax, 
-      _ unexpectedBetweenFileArgLabelAndFileArgColon: RawUnexpectedNodesSyntax? = nil, 
-      fileArgColon: RawTokenSyntax, 
-      _ unexpectedBetweenFileArgColonAndFileName: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBeforeFileLabel: RawUnexpectedNodesSyntax? = nil, 
+      fileLabel: RawTokenSyntax, 
+      _ unexpectedBetweenFileLabelAndFileColon: RawUnexpectedNodesSyntax? = nil, 
+      fileColon: RawTokenSyntax, 
+      _ unexpectedBetweenFileColonAndFileName: RawUnexpectedNodesSyntax? = nil, 
       fileName: RawStringLiteralExprSyntax, 
       _ unexpectedBetweenFileNameAndComma: RawUnexpectedNodesSyntax? = nil, 
       comma: RawTokenSyntax, 
-      _ unexpectedBetweenCommaAndLineArgLabel: RawUnexpectedNodesSyntax? = nil, 
-      lineArgLabel: RawTokenSyntax, 
-      _ unexpectedBetweenLineArgLabelAndLineArgColon: RawUnexpectedNodesSyntax? = nil, 
-      lineArgColon: RawTokenSyntax, 
-      _ unexpectedBetweenLineArgColonAndLineNumber: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBetweenCommaAndLineLabel: RawUnexpectedNodesSyntax? = nil, 
+      lineLabel: RawTokenSyntax, 
+      _ unexpectedBetweenLineLabelAndLineColon: RawUnexpectedNodesSyntax? = nil, 
+      lineColon: RawTokenSyntax, 
+      _ unexpectedBetweenLineColonAndLineNumber: RawUnexpectedNodesSyntax? = nil, 
       lineNumber: RawTokenSyntax, 
       _ unexpectedAfterLineNumber: RawUnexpectedNodesSyntax? = nil, 
       arena: __shared SyntaxArena
@@ -16833,42 +16833,42 @@ public struct RawPoundSourceLocationArgsSyntax: RawSyntaxNodeProtocol {
     let raw = RawSyntax.makeLayout(
       kind: .poundSourceLocationArgs, uninitializedCount: 15, arena: arena) { layout in
       layout.initialize(repeating: nil)
-      layout[0] = unexpectedBeforeFileArgLabel?.raw
-      layout[1] = fileArgLabel.raw
-      layout[2] = unexpectedBetweenFileArgLabelAndFileArgColon?.raw
-      layout[3] = fileArgColon.raw
-      layout[4] = unexpectedBetweenFileArgColonAndFileName?.raw
+      layout[0] = unexpectedBeforeFileLabel?.raw
+      layout[1] = fileLabel.raw
+      layout[2] = unexpectedBetweenFileLabelAndFileColon?.raw
+      layout[3] = fileColon.raw
+      layout[4] = unexpectedBetweenFileColonAndFileName?.raw
       layout[5] = fileName.raw
       layout[6] = unexpectedBetweenFileNameAndComma?.raw
       layout[7] = comma.raw
-      layout[8] = unexpectedBetweenCommaAndLineArgLabel?.raw
-      layout[9] = lineArgLabel.raw
-      layout[10] = unexpectedBetweenLineArgLabelAndLineArgColon?.raw
-      layout[11] = lineArgColon.raw
-      layout[12] = unexpectedBetweenLineArgColonAndLineNumber?.raw
+      layout[8] = unexpectedBetweenCommaAndLineLabel?.raw
+      layout[9] = lineLabel.raw
+      layout[10] = unexpectedBetweenLineLabelAndLineColon?.raw
+      layout[11] = lineColon.raw
+      layout[12] = unexpectedBetweenLineColonAndLineNumber?.raw
       layout[13] = lineNumber.raw
       layout[14] = unexpectedAfterLineNumber?.raw
     }
     self.init(unchecked: raw)
   }
   
-  public var unexpectedBeforeFileArgLabel: RawUnexpectedNodesSyntax? {
+  public var unexpectedBeforeFileLabel: RawUnexpectedNodesSyntax? {
     layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var fileArgLabel: RawTokenSyntax {
+  public var fileLabel: RawTokenSyntax {
     layoutView.children[1].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenFileArgLabelAndFileArgColon: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenFileLabelAndFileColon: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var fileArgColon: RawTokenSyntax {
+  public var fileColon: RawTokenSyntax {
     layoutView.children[3].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenFileArgColonAndFileName: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenFileColonAndFileName: RawUnexpectedNodesSyntax? {
     layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
@@ -16884,23 +16884,23 @@ public struct RawPoundSourceLocationArgsSyntax: RawSyntaxNodeProtocol {
     layoutView.children[7].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenCommaAndLineArgLabel: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenCommaAndLineLabel: RawUnexpectedNodesSyntax? {
     layoutView.children[8].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var lineArgLabel: RawTokenSyntax {
+  public var lineLabel: RawTokenSyntax {
     layoutView.children[9].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenLineArgLabelAndLineArgColon: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenLineLabelAndLineColon: RawUnexpectedNodesSyntax? {
     layoutView.children[10].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var lineArgColon: RawTokenSyntax {
+  public var lineColon: RawTokenSyntax {
     layoutView.children[11].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenLineArgColonAndLineNumber: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenLineColonAndLineNumber: RawUnexpectedNodesSyntax? {
     layoutView.children[12].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
@@ -17037,9 +17037,9 @@ public struct RawPrecedenceGroupAssignmentSyntax: RawSyntaxNodeProtocol {
   }
   
   public init(
-      _ unexpectedBeforeAssignmentKeyword: RawUnexpectedNodesSyntax? = nil, 
-      assignmentKeyword: RawTokenSyntax, 
-      _ unexpectedBetweenAssignmentKeywordAndColon: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBeforeAssignmentLabel: RawUnexpectedNodesSyntax? = nil, 
+      assignmentLabel: RawTokenSyntax, 
+      _ unexpectedBetweenAssignmentLabelAndColon: RawUnexpectedNodesSyntax? = nil, 
       colon: RawTokenSyntax, 
       _ unexpectedBetweenColonAndFlag: RawUnexpectedNodesSyntax? = nil, 
       flag: RawTokenSyntax, 
@@ -17049,9 +17049,9 @@ public struct RawPrecedenceGroupAssignmentSyntax: RawSyntaxNodeProtocol {
     let raw = RawSyntax.makeLayout(
       kind: .precedenceGroupAssignment, uninitializedCount: 7, arena: arena) { layout in
       layout.initialize(repeating: nil)
-      layout[0] = unexpectedBeforeAssignmentKeyword?.raw
-      layout[1] = assignmentKeyword.raw
-      layout[2] = unexpectedBetweenAssignmentKeywordAndColon?.raw
+      layout[0] = unexpectedBeforeAssignmentLabel?.raw
+      layout[1] = assignmentLabel.raw
+      layout[2] = unexpectedBetweenAssignmentLabelAndColon?.raw
       layout[3] = colon.raw
       layout[4] = unexpectedBetweenColonAndFlag?.raw
       layout[5] = flag.raw
@@ -17060,15 +17060,15 @@ public struct RawPrecedenceGroupAssignmentSyntax: RawSyntaxNodeProtocol {
     self.init(unchecked: raw)
   }
   
-  public var unexpectedBeforeAssignmentKeyword: RawUnexpectedNodesSyntax? {
+  public var unexpectedBeforeAssignmentLabel: RawUnexpectedNodesSyntax? {
     layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var assignmentKeyword: RawTokenSyntax {
+  public var assignmentLabel: RawTokenSyntax {
     layoutView.children[1].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenAssignmentKeywordAndColon: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenAssignmentLabelAndColon: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
@@ -17119,9 +17119,9 @@ public struct RawPrecedenceGroupAssociativitySyntax: RawSyntaxNodeProtocol {
   }
   
   public init(
-      _ unexpectedBeforeAssociativityKeyword: RawUnexpectedNodesSyntax? = nil, 
-      associativityKeyword: RawTokenSyntax, 
-      _ unexpectedBetweenAssociativityKeywordAndColon: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBeforeAssociativityLabel: RawUnexpectedNodesSyntax? = nil, 
+      associativityLabel: RawTokenSyntax, 
+      _ unexpectedBetweenAssociativityLabelAndColon: RawUnexpectedNodesSyntax? = nil, 
       colon: RawTokenSyntax, 
       _ unexpectedBetweenColonAndValue: RawUnexpectedNodesSyntax? = nil, 
       value: RawTokenSyntax, 
@@ -17131,9 +17131,9 @@ public struct RawPrecedenceGroupAssociativitySyntax: RawSyntaxNodeProtocol {
     let raw = RawSyntax.makeLayout(
       kind: .precedenceGroupAssociativity, uninitializedCount: 7, arena: arena) { layout in
       layout.initialize(repeating: nil)
-      layout[0] = unexpectedBeforeAssociativityKeyword?.raw
-      layout[1] = associativityKeyword.raw
-      layout[2] = unexpectedBetweenAssociativityKeywordAndColon?.raw
+      layout[0] = unexpectedBeforeAssociativityLabel?.raw
+      layout[1] = associativityLabel.raw
+      layout[2] = unexpectedBetweenAssociativityLabelAndColon?.raw
       layout[3] = colon.raw
       layout[4] = unexpectedBetweenColonAndValue?.raw
       layout[5] = value.raw
@@ -17142,15 +17142,15 @@ public struct RawPrecedenceGroupAssociativitySyntax: RawSyntaxNodeProtocol {
     self.init(unchecked: raw)
   }
   
-  public var unexpectedBeforeAssociativityKeyword: RawUnexpectedNodesSyntax? {
+  public var unexpectedBeforeAssociativityLabel: RawUnexpectedNodesSyntax? {
     layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var associativityKeyword: RawTokenSyntax {
+  public var associativityLabel: RawTokenSyntax {
     layoutView.children[1].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenAssociativityKeywordAndColon: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenAssociativityLabelAndColon: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
@@ -17620,9 +17620,9 @@ public struct RawPrefixOperatorExprSyntax: RawExprSyntaxNodeProtocol {
   }
   
   public init(
-      _ unexpectedBeforeOperatorToken: RawUnexpectedNodesSyntax? = nil, 
-      operatorToken: RawTokenSyntax?, 
-      _ unexpectedBetweenOperatorTokenAndPostfixExpression: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBeforeOperator: RawUnexpectedNodesSyntax? = nil, 
+      operator: RawTokenSyntax?, 
+      _ unexpectedBetweenOperatorAndPostfixExpression: RawUnexpectedNodesSyntax? = nil, 
       postfixExpression: RawExprSyntax, 
       _ unexpectedAfterPostfixExpression: RawUnexpectedNodesSyntax? = nil, 
       arena: __shared SyntaxArena
@@ -17630,24 +17630,24 @@ public struct RawPrefixOperatorExprSyntax: RawExprSyntaxNodeProtocol {
     let raw = RawSyntax.makeLayout(
       kind: .prefixOperatorExpr, uninitializedCount: 5, arena: arena) { layout in
       layout.initialize(repeating: nil)
-      layout[0] = unexpectedBeforeOperatorToken?.raw
-      layout[1] = operatorToken?.raw
-      layout[2] = unexpectedBetweenOperatorTokenAndPostfixExpression?.raw
+      layout[0] = unexpectedBeforeOperator?.raw
+      layout[1] = `operator`?.raw
+      layout[2] = unexpectedBetweenOperatorAndPostfixExpression?.raw
       layout[3] = postfixExpression.raw
       layout[4] = unexpectedAfterPostfixExpression?.raw
     }
     self.init(unchecked: raw)
   }
   
-  public var unexpectedBeforeOperatorToken: RawUnexpectedNodesSyntax? {
+  public var unexpectedBeforeOperator: RawUnexpectedNodesSyntax? {
     layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var operatorToken: RawTokenSyntax? {
+  public var `operator`: RawTokenSyntax? {
     layoutView.children[1].map(RawTokenSyntax.init(raw:))
   }
   
-  public var unexpectedBetweenOperatorTokenAndPostfixExpression: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenOperatorAndPostfixExpression: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
@@ -17690,38 +17690,38 @@ public struct RawPrimaryAssociatedTypeClauseSyntax: RawSyntaxNodeProtocol {
   }
   
   public init(
-      _ unexpectedBeforeLeftAngleBracket: RawUnexpectedNodesSyntax? = nil, 
-      leftAngleBracket: RawTokenSyntax, 
-      _ unexpectedBetweenLeftAngleBracketAndPrimaryAssociatedTypeList: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBeforeLeftAngle: RawUnexpectedNodesSyntax? = nil, 
+      leftAngle: RawTokenSyntax, 
+      _ unexpectedBetweenLeftAngleAndPrimaryAssociatedTypeList: RawUnexpectedNodesSyntax? = nil, 
       primaryAssociatedTypeList: RawPrimaryAssociatedTypeListSyntax, 
-      _ unexpectedBetweenPrimaryAssociatedTypeListAndRightAngleBracket: RawUnexpectedNodesSyntax? = nil, 
-      rightAngleBracket: RawTokenSyntax, 
-      _ unexpectedAfterRightAngleBracket: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBetweenPrimaryAssociatedTypeListAndRightAngle: RawUnexpectedNodesSyntax? = nil, 
+      rightAngle: RawTokenSyntax, 
+      _ unexpectedAfterRightAngle: RawUnexpectedNodesSyntax? = nil, 
       arena: __shared SyntaxArena
     ) {
     let raw = RawSyntax.makeLayout(
       kind: .primaryAssociatedTypeClause, uninitializedCount: 7, arena: arena) { layout in
       layout.initialize(repeating: nil)
-      layout[0] = unexpectedBeforeLeftAngleBracket?.raw
-      layout[1] = leftAngleBracket.raw
-      layout[2] = unexpectedBetweenLeftAngleBracketAndPrimaryAssociatedTypeList?.raw
+      layout[0] = unexpectedBeforeLeftAngle?.raw
+      layout[1] = leftAngle.raw
+      layout[2] = unexpectedBetweenLeftAngleAndPrimaryAssociatedTypeList?.raw
       layout[3] = primaryAssociatedTypeList.raw
-      layout[4] = unexpectedBetweenPrimaryAssociatedTypeListAndRightAngleBracket?.raw
-      layout[5] = rightAngleBracket.raw
-      layout[6] = unexpectedAfterRightAngleBracket?.raw
+      layout[4] = unexpectedBetweenPrimaryAssociatedTypeListAndRightAngle?.raw
+      layout[5] = rightAngle.raw
+      layout[6] = unexpectedAfterRightAngle?.raw
     }
     self.init(unchecked: raw)
   }
   
-  public var unexpectedBeforeLeftAngleBracket: RawUnexpectedNodesSyntax? {
+  public var unexpectedBeforeLeftAngle: RawUnexpectedNodesSyntax? {
     layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var leftAngleBracket: RawTokenSyntax {
+  public var leftAngle: RawTokenSyntax {
     layoutView.children[1].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenLeftAngleBracketAndPrimaryAssociatedTypeList: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenLeftAngleAndPrimaryAssociatedTypeList: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
@@ -17729,15 +17729,15 @@ public struct RawPrimaryAssociatedTypeClauseSyntax: RawSyntaxNodeProtocol {
     layoutView.children[3].map(RawPrimaryAssociatedTypeListSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenPrimaryAssociatedTypeListAndRightAngleBracket: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenPrimaryAssociatedTypeListAndRightAngle: RawUnexpectedNodesSyntax? {
     layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var rightAngleBracket: RawTokenSyntax {
+  public var rightAngle: RawTokenSyntax {
     layoutView.children[5].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedAfterRightAngleBracket: RawUnexpectedNodesSyntax? {
+  public var unexpectedAfterRightAngle: RawUnexpectedNodesSyntax? {
     layoutView.children[6].map(RawUnexpectedNodesSyntax.init(raw:))
   }
 }
@@ -18036,9 +18036,9 @@ public struct RawQualifiedDeclNameSyntax: RawSyntaxNodeProtocol {
   public init(
       _ unexpectedBeforeBaseType: RawUnexpectedNodesSyntax? = nil, 
       baseType: RawTypeSyntax?, 
-      _ unexpectedBetweenBaseTypeAndDot: RawUnexpectedNodesSyntax? = nil, 
-      dot: RawTokenSyntax?, 
-      _ unexpectedBetweenDotAndName: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBetweenBaseTypeAndPeriod: RawUnexpectedNodesSyntax? = nil, 
+      period: RawTokenSyntax?, 
+      _ unexpectedBetweenPeriodAndName: RawUnexpectedNodesSyntax? = nil, 
       name: RawTokenSyntax, 
       _ unexpectedBetweenNameAndArguments: RawUnexpectedNodesSyntax? = nil, 
       arguments: RawDeclNameArgumentsSyntax?, 
@@ -18050,9 +18050,9 @@ public struct RawQualifiedDeclNameSyntax: RawSyntaxNodeProtocol {
       layout.initialize(repeating: nil)
       layout[0] = unexpectedBeforeBaseType?.raw
       layout[1] = baseType?.raw
-      layout[2] = unexpectedBetweenBaseTypeAndDot?.raw
-      layout[3] = dot?.raw
-      layout[4] = unexpectedBetweenDotAndName?.raw
+      layout[2] = unexpectedBetweenBaseTypeAndPeriod?.raw
+      layout[3] = period?.raw
+      layout[4] = unexpectedBetweenPeriodAndName?.raw
       layout[5] = name.raw
       layout[6] = unexpectedBetweenNameAndArguments?.raw
       layout[7] = arguments?.raw
@@ -18069,15 +18069,15 @@ public struct RawQualifiedDeclNameSyntax: RawSyntaxNodeProtocol {
     layoutView.children[1].map(RawTypeSyntax.init(raw:))
   }
   
-  public var unexpectedBetweenBaseTypeAndDot: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenBaseTypeAndPeriod: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var dot: RawTokenSyntax? {
+  public var period: RawTokenSyntax? {
     layoutView.children[3].map(RawTokenSyntax.init(raw:))
   }
   
-  public var unexpectedBetweenDotAndName: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenPeriodAndName: RawUnexpectedNodesSyntax? {
     layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
@@ -18680,9 +18680,9 @@ public struct RawSourceFileSyntax: RawSyntaxNodeProtocol {
   public init(
       _ unexpectedBeforeStatements: RawUnexpectedNodesSyntax? = nil, 
       statements: RawCodeBlockItemListSyntax, 
-      _ unexpectedBetweenStatementsAndEOFToken: RawUnexpectedNodesSyntax? = nil, 
-      eofToken: RawTokenSyntax, 
-      _ unexpectedAfterEOFToken: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBetweenStatementsAndEndOfFileToken: RawUnexpectedNodesSyntax? = nil, 
+      endOfFileToken: RawTokenSyntax, 
+      _ unexpectedAfterEndOfFileToken: RawUnexpectedNodesSyntax? = nil, 
       arena: __shared SyntaxArena
     ) {
     let raw = RawSyntax.makeLayout(
@@ -18690,9 +18690,9 @@ public struct RawSourceFileSyntax: RawSyntaxNodeProtocol {
       layout.initialize(repeating: nil)
       layout[0] = unexpectedBeforeStatements?.raw
       layout[1] = statements.raw
-      layout[2] = unexpectedBetweenStatementsAndEOFToken?.raw
-      layout[3] = eofToken.raw
-      layout[4] = unexpectedAfterEOFToken?.raw
+      layout[2] = unexpectedBetweenStatementsAndEndOfFileToken?.raw
+      layout[3] = endOfFileToken.raw
+      layout[4] = unexpectedAfterEndOfFileToken?.raw
     }
     self.init(unchecked: raw)
   }
@@ -18705,15 +18705,15 @@ public struct RawSourceFileSyntax: RawSyntaxNodeProtocol {
     layoutView.children[1].map(RawCodeBlockItemListSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenStatementsAndEOFToken: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenStatementsAndEndOfFileToken: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var eofToken: RawTokenSyntax {
+  public var endOfFileToken: RawTokenSyntax {
     layoutView.children[3].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedAfterEOFToken: RawUnexpectedNodesSyntax? {
+  public var unexpectedAfterEndOfFileToken: RawUnexpectedNodesSyntax? {
     layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
   }
 }
@@ -19511,13 +19511,13 @@ public struct RawSubscriptExprSyntax: RawExprSyntaxNodeProtocol {
   public init(
       _ unexpectedBeforeCalledExpression: RawUnexpectedNodesSyntax? = nil, 
       calledExpression: RawExprSyntax, 
-      _ unexpectedBetweenCalledExpressionAndLeftBracket: RawUnexpectedNodesSyntax? = nil, 
-      leftBracket: RawTokenSyntax, 
-      _ unexpectedBetweenLeftBracketAndArgumentList: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBetweenCalledExpressionAndLeftSquare: RawUnexpectedNodesSyntax? = nil, 
+      leftSquare: RawTokenSyntax, 
+      _ unexpectedBetweenLeftSquareAndArgumentList: RawUnexpectedNodesSyntax? = nil, 
       argumentList: RawTupleExprElementListSyntax, 
-      _ unexpectedBetweenArgumentListAndRightBracket: RawUnexpectedNodesSyntax? = nil, 
-      rightBracket: RawTokenSyntax, 
-      _ unexpectedBetweenRightBracketAndTrailingClosure: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBetweenArgumentListAndRightSquare: RawUnexpectedNodesSyntax? = nil, 
+      rightSquare: RawTokenSyntax, 
+      _ unexpectedBetweenRightSquareAndTrailingClosure: RawUnexpectedNodesSyntax? = nil, 
       trailingClosure: RawClosureExprSyntax?, 
       _ unexpectedBetweenTrailingClosureAndAdditionalTrailingClosures: RawUnexpectedNodesSyntax? = nil, 
       additionalTrailingClosures: RawMultipleTrailingClosureElementListSyntax?, 
@@ -19529,13 +19529,13 @@ public struct RawSubscriptExprSyntax: RawExprSyntaxNodeProtocol {
       layout.initialize(repeating: nil)
       layout[0] = unexpectedBeforeCalledExpression?.raw
       layout[1] = calledExpression.raw
-      layout[2] = unexpectedBetweenCalledExpressionAndLeftBracket?.raw
-      layout[3] = leftBracket.raw
-      layout[4] = unexpectedBetweenLeftBracketAndArgumentList?.raw
+      layout[2] = unexpectedBetweenCalledExpressionAndLeftSquare?.raw
+      layout[3] = leftSquare.raw
+      layout[4] = unexpectedBetweenLeftSquareAndArgumentList?.raw
       layout[5] = argumentList.raw
-      layout[6] = unexpectedBetweenArgumentListAndRightBracket?.raw
-      layout[7] = rightBracket.raw
-      layout[8] = unexpectedBetweenRightBracketAndTrailingClosure?.raw
+      layout[6] = unexpectedBetweenArgumentListAndRightSquare?.raw
+      layout[7] = rightSquare.raw
+      layout[8] = unexpectedBetweenRightSquareAndTrailingClosure?.raw
       layout[9] = trailingClosure?.raw
       layout[10] = unexpectedBetweenTrailingClosureAndAdditionalTrailingClosures?.raw
       layout[11] = additionalTrailingClosures?.raw
@@ -19552,15 +19552,15 @@ public struct RawSubscriptExprSyntax: RawExprSyntaxNodeProtocol {
     layoutView.children[1].map(RawExprSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenCalledExpressionAndLeftBracket: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenCalledExpressionAndLeftSquare: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var leftBracket: RawTokenSyntax {
+  public var leftSquare: RawTokenSyntax {
     layoutView.children[3].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenLeftBracketAndArgumentList: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenLeftSquareAndArgumentList: RawUnexpectedNodesSyntax? {
     layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
@@ -19568,15 +19568,15 @@ public struct RawSubscriptExprSyntax: RawExprSyntaxNodeProtocol {
     layoutView.children[5].map(RawTupleExprElementListSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenArgumentListAndRightBracket: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenArgumentListAndRightSquare: RawUnexpectedNodesSyntax? {
     layoutView.children[6].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var rightBracket: RawTokenSyntax {
+  public var rightSquare: RawTokenSyntax {
     layoutView.children[7].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenRightBracketAndTrailingClosure: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenRightSquareAndTrailingClosure: RawUnexpectedNodesSyntax? {
     layoutView.children[8].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
@@ -20205,9 +20205,9 @@ public struct RawTargetFunctionEntrySyntax: RawSyntaxNodeProtocol {
   }
   
   public init(
-      _ unexpectedBeforeLabel: RawUnexpectedNodesSyntax? = nil, 
-      label: RawTokenSyntax, 
-      _ unexpectedBetweenLabelAndColon: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBeforeTargetLabel: RawUnexpectedNodesSyntax? = nil, 
+      targetLabel: RawTokenSyntax, 
+      _ unexpectedBetweenTargetLabelAndColon: RawUnexpectedNodesSyntax? = nil, 
       colon: RawTokenSyntax, 
       _ unexpectedBetweenColonAndDeclname: RawUnexpectedNodesSyntax? = nil, 
       declname: RawDeclNameSyntax, 
@@ -20219,9 +20219,9 @@ public struct RawTargetFunctionEntrySyntax: RawSyntaxNodeProtocol {
     let raw = RawSyntax.makeLayout(
       kind: .targetFunctionEntry, uninitializedCount: 9, arena: arena) { layout in
       layout.initialize(repeating: nil)
-      layout[0] = unexpectedBeforeLabel?.raw
-      layout[1] = label.raw
-      layout[2] = unexpectedBetweenLabelAndColon?.raw
+      layout[0] = unexpectedBeforeTargetLabel?.raw
+      layout[1] = targetLabel.raw
+      layout[2] = unexpectedBetweenTargetLabelAndColon?.raw
       layout[3] = colon.raw
       layout[4] = unexpectedBetweenColonAndDeclname?.raw
       layout[5] = declname.raw
@@ -20232,15 +20232,15 @@ public struct RawTargetFunctionEntrySyntax: RawSyntaxNodeProtocol {
     self.init(unchecked: raw)
   }
   
-  public var unexpectedBeforeLabel: RawUnexpectedNodesSyntax? {
+  public var unexpectedBeforeTargetLabel: RawUnexpectedNodesSyntax? {
     layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var label: RawTokenSyntax {
+  public var targetLabel: RawTokenSyntax {
     layoutView.children[1].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenLabelAndColon: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenTargetLabelAndColon: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
@@ -20305,9 +20305,9 @@ public struct RawTernaryExprSyntax: RawExprSyntaxNodeProtocol {
       questionMark: RawTokenSyntax, 
       _ unexpectedBetweenQuestionMarkAndFirstChoice: RawUnexpectedNodesSyntax? = nil, 
       firstChoice: RawExprSyntax, 
-      _ unexpectedBetweenFirstChoiceAndColonMark: RawUnexpectedNodesSyntax? = nil, 
-      colonMark: RawTokenSyntax, 
-      _ unexpectedBetweenColonMarkAndSecondChoice: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBetweenFirstChoiceAndColon: RawUnexpectedNodesSyntax? = nil, 
+      colon: RawTokenSyntax, 
+      _ unexpectedBetweenColonAndSecondChoice: RawUnexpectedNodesSyntax? = nil, 
       secondChoice: RawExprSyntax, 
       _ unexpectedAfterSecondChoice: RawUnexpectedNodesSyntax? = nil, 
       arena: __shared SyntaxArena
@@ -20321,9 +20321,9 @@ public struct RawTernaryExprSyntax: RawExprSyntaxNodeProtocol {
       layout[3] = questionMark.raw
       layout[4] = unexpectedBetweenQuestionMarkAndFirstChoice?.raw
       layout[5] = firstChoice.raw
-      layout[6] = unexpectedBetweenFirstChoiceAndColonMark?.raw
-      layout[7] = colonMark.raw
-      layout[8] = unexpectedBetweenColonMarkAndSecondChoice?.raw
+      layout[6] = unexpectedBetweenFirstChoiceAndColon?.raw
+      layout[7] = colon.raw
+      layout[8] = unexpectedBetweenColonAndSecondChoice?.raw
       layout[9] = secondChoice.raw
       layout[10] = unexpectedAfterSecondChoice?.raw
     }
@@ -20354,15 +20354,15 @@ public struct RawTernaryExprSyntax: RawExprSyntaxNodeProtocol {
     layoutView.children[5].map(RawExprSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenFirstChoiceAndColonMark: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenFirstChoiceAndColon: RawUnexpectedNodesSyntax? {
     layoutView.children[6].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var colonMark: RawTokenSyntax {
+  public var colon: RawTokenSyntax {
     layoutView.children[7].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenColonMarkAndSecondChoice: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenColonAndSecondChoice: RawUnexpectedNodesSyntax? {
     layoutView.children[8].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
@@ -20833,11 +20833,11 @@ public struct RawTuplePatternElementSyntax: RawSyntaxNodeProtocol {
   }
   
   public init(
-      _ unexpectedBeforeLabelName: RawUnexpectedNodesSyntax? = nil, 
-      labelName: RawTokenSyntax?, 
-      _ unexpectedBetweenLabelNameAndLabelColon: RawUnexpectedNodesSyntax? = nil, 
-      labelColon: RawTokenSyntax?, 
-      _ unexpectedBetweenLabelColonAndPattern: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBeforeLabel: RawUnexpectedNodesSyntax? = nil, 
+      label: RawTokenSyntax?, 
+      _ unexpectedBetweenLabelAndColon: RawUnexpectedNodesSyntax? = nil, 
+      colon: RawTokenSyntax?, 
+      _ unexpectedBetweenColonAndPattern: RawUnexpectedNodesSyntax? = nil, 
       pattern: RawPatternSyntax, 
       _ unexpectedBetweenPatternAndTrailingComma: RawUnexpectedNodesSyntax? = nil, 
       trailingComma: RawTokenSyntax?, 
@@ -20847,11 +20847,11 @@ public struct RawTuplePatternElementSyntax: RawSyntaxNodeProtocol {
     let raw = RawSyntax.makeLayout(
       kind: .tuplePatternElement, uninitializedCount: 9, arena: arena) { layout in
       layout.initialize(repeating: nil)
-      layout[0] = unexpectedBeforeLabelName?.raw
-      layout[1] = labelName?.raw
-      layout[2] = unexpectedBetweenLabelNameAndLabelColon?.raw
-      layout[3] = labelColon?.raw
-      layout[4] = unexpectedBetweenLabelColonAndPattern?.raw
+      layout[0] = unexpectedBeforeLabel?.raw
+      layout[1] = label?.raw
+      layout[2] = unexpectedBetweenLabelAndColon?.raw
+      layout[3] = colon?.raw
+      layout[4] = unexpectedBetweenColonAndPattern?.raw
       layout[5] = pattern.raw
       layout[6] = unexpectedBetweenPatternAndTrailingComma?.raw
       layout[7] = trailingComma?.raw
@@ -20860,23 +20860,23 @@ public struct RawTuplePatternElementSyntax: RawSyntaxNodeProtocol {
     self.init(unchecked: raw)
   }
   
-  public var unexpectedBeforeLabelName: RawUnexpectedNodesSyntax? {
+  public var unexpectedBeforeLabel: RawUnexpectedNodesSyntax? {
     layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var labelName: RawTokenSyntax? {
+  public var label: RawTokenSyntax? {
     layoutView.children[1].map(RawTokenSyntax.init(raw:))
   }
   
-  public var unexpectedBetweenLabelNameAndLabelColon: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenLabelAndColon: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var labelColon: RawTokenSyntax? {
+  public var colon: RawTokenSyntax? {
     layoutView.children[3].map(RawTokenSyntax.init(raw:))
   }
   
-  public var unexpectedBetweenLabelColonAndPattern: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenColonAndPattern: RawUnexpectedNodesSyntax? {
     layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
@@ -21059,9 +21059,9 @@ public struct RawTupleTypeElementSyntax: RawSyntaxNodeProtocol {
   }
   
   public init(
-      _ unexpectedBeforeInOut: RawUnexpectedNodesSyntax? = nil, 
-      inOut: RawTokenSyntax?, 
-      _ unexpectedBetweenInOutAndName: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBeforeInoutKeyword: RawUnexpectedNodesSyntax? = nil, 
+      inoutKeyword: RawTokenSyntax?, 
+      _ unexpectedBetweenInoutKeywordAndName: RawUnexpectedNodesSyntax? = nil, 
       name: RawTokenSyntax?, 
       _ unexpectedBetweenNameAndSecondName: RawUnexpectedNodesSyntax? = nil, 
       secondName: RawTokenSyntax?, 
@@ -21081,9 +21081,9 @@ public struct RawTupleTypeElementSyntax: RawSyntaxNodeProtocol {
     let raw = RawSyntax.makeLayout(
       kind: .tupleTypeElement, uninitializedCount: 17, arena: arena) { layout in
       layout.initialize(repeating: nil)
-      layout[0] = unexpectedBeforeInOut?.raw
-      layout[1] = inOut?.raw
-      layout[2] = unexpectedBetweenInOutAndName?.raw
+      layout[0] = unexpectedBeforeInoutKeyword?.raw
+      layout[1] = inoutKeyword?.raw
+      layout[2] = unexpectedBetweenInoutKeywordAndName?.raw
       layout[3] = name?.raw
       layout[4] = unexpectedBetweenNameAndSecondName?.raw
       layout[5] = secondName?.raw
@@ -21102,15 +21102,15 @@ public struct RawTupleTypeElementSyntax: RawSyntaxNodeProtocol {
     self.init(unchecked: raw)
   }
   
-  public var unexpectedBeforeInOut: RawUnexpectedNodesSyntax? {
+  public var unexpectedBeforeInoutKeyword: RawUnexpectedNodesSyntax? {
     layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var inOut: RawTokenSyntax? {
+  public var inoutKeyword: RawTokenSyntax? {
     layoutView.children[1].map(RawTokenSyntax.init(raw:))
   }
   
-  public var unexpectedBetweenInOutAndName: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenInoutKeywordAndName: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
@@ -22004,9 +22004,9 @@ public struct RawUnresolvedAsExprSyntax: RawExprSyntaxNodeProtocol {
   }
   
   public init(
-      _ unexpectedBeforeAsTok: RawUnexpectedNodesSyntax? = nil, 
-      asTok: RawTokenSyntax, 
-      _ unexpectedBetweenAsTokAndQuestionOrExclamationMark: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBeforeAsKeyword: RawUnexpectedNodesSyntax? = nil, 
+      asKeyword: RawTokenSyntax, 
+      _ unexpectedBetweenAsKeywordAndQuestionOrExclamationMark: RawUnexpectedNodesSyntax? = nil, 
       questionOrExclamationMark: RawTokenSyntax?, 
       _ unexpectedAfterQuestionOrExclamationMark: RawUnexpectedNodesSyntax? = nil, 
       arena: __shared SyntaxArena
@@ -22014,24 +22014,24 @@ public struct RawUnresolvedAsExprSyntax: RawExprSyntaxNodeProtocol {
     let raw = RawSyntax.makeLayout(
       kind: .unresolvedAsExpr, uninitializedCount: 5, arena: arena) { layout in
       layout.initialize(repeating: nil)
-      layout[0] = unexpectedBeforeAsTok?.raw
-      layout[1] = asTok.raw
-      layout[2] = unexpectedBetweenAsTokAndQuestionOrExclamationMark?.raw
+      layout[0] = unexpectedBeforeAsKeyword?.raw
+      layout[1] = asKeyword.raw
+      layout[2] = unexpectedBetweenAsKeywordAndQuestionOrExclamationMark?.raw
       layout[3] = questionOrExclamationMark?.raw
       layout[4] = unexpectedAfterQuestionOrExclamationMark?.raw
     }
     self.init(unchecked: raw)
   }
   
-  public var unexpectedBeforeAsTok: RawUnexpectedNodesSyntax? {
+  public var unexpectedBeforeAsKeyword: RawUnexpectedNodesSyntax? {
     layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var asTok: RawTokenSyntax {
+  public var asKeyword: RawTokenSyntax {
     layoutView.children[1].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenAsTokAndQuestionOrExclamationMark: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenAsKeywordAndQuestionOrExclamationMark: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
@@ -22074,30 +22074,30 @@ public struct RawUnresolvedIsExprSyntax: RawExprSyntaxNodeProtocol {
   }
   
   public init(
-      _ unexpectedBeforeIsTok: RawUnexpectedNodesSyntax? = nil, 
-      isTok: RawTokenSyntax, 
-      _ unexpectedAfterIsTok: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBeforeIsKeyword: RawUnexpectedNodesSyntax? = nil, 
+      isKeyword: RawTokenSyntax, 
+      _ unexpectedAfterIsKeyword: RawUnexpectedNodesSyntax? = nil, 
       arena: __shared SyntaxArena
     ) {
     let raw = RawSyntax.makeLayout(
       kind: .unresolvedIsExpr, uninitializedCount: 3, arena: arena) { layout in
       layout.initialize(repeating: nil)
-      layout[0] = unexpectedBeforeIsTok?.raw
-      layout[1] = isTok.raw
-      layout[2] = unexpectedAfterIsTok?.raw
+      layout[0] = unexpectedBeforeIsKeyword?.raw
+      layout[1] = isKeyword.raw
+      layout[2] = unexpectedAfterIsKeyword?.raw
     }
     self.init(unchecked: raw)
   }
   
-  public var unexpectedBeforeIsTok: RawUnexpectedNodesSyntax? {
+  public var unexpectedBeforeIsKeyword: RawUnexpectedNodesSyntax? {
     layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var isTok: RawTokenSyntax {
+  public var isKeyword: RawTokenSyntax {
     layoutView.children[1].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedAfterIsTok: RawUnexpectedNodesSyntax? {
+  public var unexpectedAfterIsKeyword: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
 }
@@ -22194,9 +22194,9 @@ public struct RawUnresolvedTernaryExprSyntax: RawExprSyntaxNodeProtocol {
       questionMark: RawTokenSyntax, 
       _ unexpectedBetweenQuestionMarkAndFirstChoice: RawUnexpectedNodesSyntax? = nil, 
       firstChoice: RawExprSyntax, 
-      _ unexpectedBetweenFirstChoiceAndColonMark: RawUnexpectedNodesSyntax? = nil, 
-      colonMark: RawTokenSyntax, 
-      _ unexpectedAfterColonMark: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBetweenFirstChoiceAndColon: RawUnexpectedNodesSyntax? = nil, 
+      colon: RawTokenSyntax, 
+      _ unexpectedAfterColon: RawUnexpectedNodesSyntax? = nil, 
       arena: __shared SyntaxArena
     ) {
     let raw = RawSyntax.makeLayout(
@@ -22206,9 +22206,9 @@ public struct RawUnresolvedTernaryExprSyntax: RawExprSyntaxNodeProtocol {
       layout[1] = questionMark.raw
       layout[2] = unexpectedBetweenQuestionMarkAndFirstChoice?.raw
       layout[3] = firstChoice.raw
-      layout[4] = unexpectedBetweenFirstChoiceAndColonMark?.raw
-      layout[5] = colonMark.raw
-      layout[6] = unexpectedAfterColonMark?.raw
+      layout[4] = unexpectedBetweenFirstChoiceAndColon?.raw
+      layout[5] = colon.raw
+      layout[6] = unexpectedAfterColon?.raw
     }
     self.init(unchecked: raw)
   }
@@ -22229,15 +22229,15 @@ public struct RawUnresolvedTernaryExprSyntax: RawExprSyntaxNodeProtocol {
     layoutView.children[3].map(RawExprSyntax.init(raw:))!
   }
   
-  public var unexpectedBetweenFirstChoiceAndColonMark: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenFirstChoiceAndColon: RawUnexpectedNodesSyntax? {
     layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   
-  public var colonMark: RawTokenSyntax {
+  public var colon: RawTokenSyntax {
     layoutView.children[5].map(RawTokenSyntax.init(raw:))!
   }
   
-  public var unexpectedAfterColonMark: RawUnexpectedNodesSyntax? {
+  public var unexpectedAfterColon: RawUnexpectedNodesSyntax? {
     layoutView.children[6].map(RawUnexpectedNodesSyntax.init(raw:))
   }
 }
diff --git a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxDeclNodes.swift b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxDeclNodes.swift
index c7b79aa4749..3a2a56053f8 100644
--- a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxDeclNodes.swift
+++ b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxDeclNodes.swift
@@ -4111,7 +4111,7 @@ public struct MacroDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
 /// 
 ///  - `attributes`: ``AttributeListSyntax``
 ///  - `modifiers`: ``ModifierListSyntax``
-///  - `poundToken`: `'#'`
+///  - `pound`: `'#'`
 ///  - `macro`: `<identifier>`
 ///  - `genericArguments`: ``GenericArgumentClauseSyntax``?
 ///  - `leftParen`: `'('`?
@@ -4143,9 +4143,9 @@ public struct MacroExpansionDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
       attributes: AttributeListSyntax? = nil,
       _ unexpectedBetweenAttributesAndModifiers: UnexpectedNodesSyntax? = nil,
       modifiers: ModifierListSyntax? = nil,
-      _ unexpectedBetweenModifiersAndPoundToken: UnexpectedNodesSyntax? = nil,
-      poundToken: TokenSyntax = .poundToken(),
-      _ unexpectedBetweenPoundTokenAndMacro: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBetweenModifiersAndPound: UnexpectedNodesSyntax? = nil,
+      pound: TokenSyntax = .poundToken(),
+      _ unexpectedBetweenPoundAndMacro: UnexpectedNodesSyntax? = nil,
       macro: TokenSyntax,
       _ unexpectedBetweenMacroAndGenericArguments: UnexpectedNodesSyntax? = nil,
       genericArguments: GenericArgumentClauseSyntax? = nil,
@@ -4170,9 +4170,9 @@ public struct MacroExpansionDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
             attributes, 
             unexpectedBetweenAttributesAndModifiers, 
             modifiers, 
-            unexpectedBetweenModifiersAndPoundToken, 
-            poundToken, 
-            unexpectedBetweenPoundTokenAndMacro, 
+            unexpectedBetweenModifiersAndPound, 
+            pound, 
+            unexpectedBetweenPoundAndMacro, 
             macro, 
             unexpectedBetweenMacroAndGenericArguments, 
             genericArguments, 
@@ -4193,9 +4193,9 @@ public struct MacroExpansionDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
           attributes?.raw, 
           unexpectedBetweenAttributesAndModifiers?.raw, 
           modifiers?.raw, 
-          unexpectedBetweenModifiersAndPoundToken?.raw, 
-          poundToken.raw, 
-          unexpectedBetweenPoundTokenAndMacro?.raw, 
+          unexpectedBetweenModifiersAndPound?.raw, 
+          pound.raw, 
+          unexpectedBetweenPoundAndMacro?.raw, 
           macro.raw, 
           unexpectedBetweenMacroAndGenericArguments?.raw, 
           genericArguments?.raw, 
@@ -4308,7 +4308,7 @@ public struct MacroExpansionDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
     return MacroExpansionDeclSyntax(newData)
   }
   
-  public var unexpectedBetweenModifiersAndPoundToken: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenModifiersAndPound: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 4, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -4318,7 +4318,7 @@ public struct MacroExpansionDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
   }
   
   /// The `#` sign.
-  public var poundToken: TokenSyntax {
+  public var pound: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 5, parent: Syntax(self))!)
     }
@@ -4327,7 +4327,7 @@ public struct MacroExpansionDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenPoundTokenAndMacro: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenPoundAndMacro: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 6, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -4516,9 +4516,9 @@ public struct MacroExpansionDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
           \Self.attributes, 
           \Self.unexpectedBetweenAttributesAndModifiers, 
           \Self.modifiers, 
-          \Self.unexpectedBetweenModifiersAndPoundToken, 
-          \Self.poundToken, 
-          \Self.unexpectedBetweenPoundTokenAndMacro, 
+          \Self.unexpectedBetweenModifiersAndPound, 
+          \Self.pound, 
+          \Self.unexpectedBetweenPoundAndMacro, 
           \Self.macro, 
           \Self.unexpectedBetweenMacroAndGenericArguments, 
           \Self.genericArguments, 
diff --git a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxExprNodes.swift b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxExprNodes.swift
index 3e497418aea..c26ea14b6a7 100644
--- a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxExprNodes.swift
+++ b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxExprNodes.swift
@@ -191,7 +191,7 @@ public struct ArrayExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
 /// ### Children
 /// 
 ///  - `effectSpecifiers`: ``TypeEffectSpecifiersSyntax``?
-///  - `arrowToken`: `'->'`
+///  - `arrow`: `'->'`
 public struct ArrowExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
   public let _syntaxNode: Syntax
   
@@ -214,9 +214,9 @@ public struct ArrowExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
       leadingTrivia: Trivia? = nil,
       _ unexpectedBeforeEffectSpecifiers: UnexpectedNodesSyntax? = nil,
       effectSpecifiers: TypeEffectSpecifiersSyntax? = nil,
-      _ unexpectedBetweenEffectSpecifiersAndArrowToken: UnexpectedNodesSyntax? = nil,
-      arrowToken: TokenSyntax = .arrowToken(),
-      _ unexpectedAfterArrowToken: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBetweenEffectSpecifiersAndArrow: UnexpectedNodesSyntax? = nil,
+      arrow: TokenSyntax = .arrowToken(),
+      _ unexpectedAfterArrow: UnexpectedNodesSyntax? = nil,
       trailingTrivia: Trivia? = nil
     
   ) {
@@ -225,16 +225,16 @@ public struct ArrowExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (
             unexpectedBeforeEffectSpecifiers, 
             effectSpecifiers, 
-            unexpectedBetweenEffectSpecifiersAndArrowToken, 
-            arrowToken, 
-            unexpectedAfterArrowToken
+            unexpectedBetweenEffectSpecifiersAndArrow, 
+            arrow, 
+            unexpectedAfterArrow
           ))) { (arena, _) in
       let layout: [RawSyntax?] = [
           unexpectedBeforeEffectSpecifiers?.raw, 
           effectSpecifiers?.raw, 
-          unexpectedBetweenEffectSpecifiersAndArrowToken?.raw, 
-          arrowToken.raw, 
-          unexpectedAfterArrowToken?.raw
+          unexpectedBetweenEffectSpecifiersAndArrow?.raw, 
+          arrow.raw, 
+          unexpectedAfterArrow?.raw
         ]
       let raw = RawSyntax.makeLayout(
         kind: SyntaxKind.arrowExpr,
@@ -267,7 +267,7 @@ public struct ArrowExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenEffectSpecifiersAndArrowToken: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenEffectSpecifiersAndArrow: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -276,7 +276,7 @@ public struct ArrowExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var arrowToken: TokenSyntax {
+  public var arrow: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 3, parent: Syntax(self))!)
     }
@@ -285,7 +285,7 @@ public struct ArrowExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedAfterArrowToken: UnexpectedNodesSyntax? {
+  public var unexpectedAfterArrow: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 4, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -298,9 +298,9 @@ public struct ArrowExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     return .layout([
           \Self.unexpectedBeforeEffectSpecifiers, 
           \Self.effectSpecifiers, 
-          \Self.unexpectedBetweenEffectSpecifiersAndArrowToken, 
-          \Self.arrowToken, 
-          \Self.unexpectedAfterArrowToken
+          \Self.unexpectedBetweenEffectSpecifiersAndArrow, 
+          \Self.arrow, 
+          \Self.unexpectedAfterArrow
         ])
   }
 }
@@ -312,7 +312,7 @@ public struct ArrowExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
 /// ### Children
 /// 
 ///  - `expression`: ``ExprSyntax``
-///  - `asTok`: `'as'`
+///  - `asKeyword`: `'as'`
 ///  - `questionOrExclamationMark`: (`'?'` | `'!'`)?
 ///  - `typeName`: ``TypeSyntax``
 public struct AsExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
@@ -337,9 +337,9 @@ public struct AsExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
       leadingTrivia: Trivia? = nil,
       _ unexpectedBeforeExpression: UnexpectedNodesSyntax? = nil,
       expression: some ExprSyntaxProtocol,
-      _ unexpectedBetweenExpressionAndAsTok: UnexpectedNodesSyntax? = nil,
-      asTok: TokenSyntax = .keyword(.as),
-      _ unexpectedBetweenAsTokAndQuestionOrExclamationMark: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBetweenExpressionAndAsKeyword: UnexpectedNodesSyntax? = nil,
+      asKeyword: TokenSyntax = .keyword(.as),
+      _ unexpectedBetweenAsKeywordAndQuestionOrExclamationMark: UnexpectedNodesSyntax? = nil,
       questionOrExclamationMark: TokenSyntax? = nil,
       _ unexpectedBetweenQuestionOrExclamationMarkAndTypeName: UnexpectedNodesSyntax? = nil,
       typeName: some TypeSyntaxProtocol,
@@ -352,9 +352,9 @@ public struct AsExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (
             unexpectedBeforeExpression, 
             expression, 
-            unexpectedBetweenExpressionAndAsTok, 
-            asTok, 
-            unexpectedBetweenAsTokAndQuestionOrExclamationMark, 
+            unexpectedBetweenExpressionAndAsKeyword, 
+            asKeyword, 
+            unexpectedBetweenAsKeywordAndQuestionOrExclamationMark, 
             questionOrExclamationMark, 
             unexpectedBetweenQuestionOrExclamationMarkAndTypeName, 
             typeName, 
@@ -363,9 +363,9 @@ public struct AsExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
       let layout: [RawSyntax?] = [
           unexpectedBeforeExpression?.raw, 
           expression.raw, 
-          unexpectedBetweenExpressionAndAsTok?.raw, 
-          asTok.raw, 
-          unexpectedBetweenAsTokAndQuestionOrExclamationMark?.raw, 
+          unexpectedBetweenExpressionAndAsKeyword?.raw, 
+          asKeyword.raw, 
+          unexpectedBetweenAsKeywordAndQuestionOrExclamationMark?.raw, 
           questionOrExclamationMark?.raw, 
           unexpectedBetweenQuestionOrExclamationMarkAndTypeName?.raw, 
           typeName.raw, 
@@ -402,7 +402,7 @@ public struct AsExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenExpressionAndAsTok: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenExpressionAndAsKeyword: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -411,7 +411,7 @@ public struct AsExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var asTok: TokenSyntax {
+  public var asKeyword: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 3, parent: Syntax(self))!)
     }
@@ -420,7 +420,7 @@ public struct AsExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenAsTokAndQuestionOrExclamationMark: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenAsKeywordAndQuestionOrExclamationMark: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 4, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -469,9 +469,9 @@ public struct AsExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     return .layout([
           \Self.unexpectedBeforeExpression, 
           \Self.expression, 
-          \Self.unexpectedBetweenExpressionAndAsTok, 
-          \Self.asTok, 
-          \Self.unexpectedBetweenAsTokAndQuestionOrExclamationMark, 
+          \Self.unexpectedBetweenExpressionAndAsKeyword, 
+          \Self.asKeyword, 
+          \Self.unexpectedBetweenAsKeywordAndQuestionOrExclamationMark, 
           \Self.questionOrExclamationMark, 
           \Self.unexpectedBetweenQuestionOrExclamationMarkAndTypeName, 
           \Self.typeName, 
@@ -486,7 +486,7 @@ public struct AsExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
 
 /// ### Children
 /// 
-///  - `assignToken`: `'='`
+///  - `equal`: `'='`
 public struct AssignmentExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
   public let _syntaxNode: Syntax
   
@@ -507,16 +507,16 @@ public struct AssignmentExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
   
   public init(
       leadingTrivia: Trivia? = nil,
-      _ unexpectedBeforeAssignToken: UnexpectedNodesSyntax? = nil,
-      assignToken: TokenSyntax = .equalToken(),
-      _ unexpectedAfterAssignToken: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBeforeEqual: UnexpectedNodesSyntax? = nil,
+      equal: TokenSyntax = .equalToken(),
+      _ unexpectedAfterEqual: UnexpectedNodesSyntax? = nil,
       trailingTrivia: Trivia? = nil
     
   ) {
     // Extend the lifetime of all parameters so their arenas don't get destroyed
     // before they can be added as children of the new arena.
-    let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (unexpectedBeforeAssignToken, assignToken, unexpectedAfterAssignToken))) { (arena, _) in
-      let layout: [RawSyntax?] = [unexpectedBeforeAssignToken?.raw, assignToken.raw, unexpectedAfterAssignToken?.raw]
+    let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (unexpectedBeforeEqual, equal, unexpectedAfterEqual))) { (arena, _) in
+      let layout: [RawSyntax?] = [unexpectedBeforeEqual?.raw, equal.raw, unexpectedAfterEqual?.raw]
       let raw = RawSyntax.makeLayout(
         kind: SyntaxKind.assignmentExpr,
         from: layout,
@@ -530,7 +530,7 @@ public struct AssignmentExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     self.init(data)
   }
   
-  public var unexpectedBeforeAssignToken: UnexpectedNodesSyntax? {
+  public var unexpectedBeforeEqual: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 0, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -539,7 +539,7 @@ public struct AssignmentExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var assignToken: TokenSyntax {
+  public var equal: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 1, parent: Syntax(self))!)
     }
@@ -548,7 +548,7 @@ public struct AssignmentExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedAfterAssignToken: UnexpectedNodesSyntax? {
+  public var unexpectedAfterEqual: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -558,7 +558,7 @@ public struct AssignmentExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
   }
   
   public static var structure: SyntaxNodeStructure {
-    return .layout([\Self.unexpectedBeforeAssignToken, \Self.assignToken, \Self.unexpectedAfterAssignToken])
+    return .layout([\Self.unexpectedBeforeEqual, \Self.equal, \Self.unexpectedAfterEqual])
   }
 }
 
@@ -689,7 +689,7 @@ public struct AwaitExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
 
 /// ### Children
 /// 
-///  - `operatorToken`: `<binaryOperator>`
+///  - `operator`: `<binaryOperator>`
 public struct BinaryOperatorExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
   public let _syntaxNode: Syntax
   
@@ -710,16 +710,16 @@ public struct BinaryOperatorExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
   
   public init(
       leadingTrivia: Trivia? = nil,
-      _ unexpectedBeforeOperatorToken: UnexpectedNodesSyntax? = nil,
-      operatorToken: TokenSyntax,
-      _ unexpectedAfterOperatorToken: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBeforeOperator: UnexpectedNodesSyntax? = nil,
+      operator: TokenSyntax,
+      _ unexpectedAfterOperator: UnexpectedNodesSyntax? = nil,
       trailingTrivia: Trivia? = nil
     
   ) {
     // Extend the lifetime of all parameters so their arenas don't get destroyed
     // before they can be added as children of the new arena.
-    let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (unexpectedBeforeOperatorToken, operatorToken, unexpectedAfterOperatorToken))) { (arena, _) in
-      let layout: [RawSyntax?] = [unexpectedBeforeOperatorToken?.raw, operatorToken.raw, unexpectedAfterOperatorToken?.raw]
+    let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (unexpectedBeforeOperator, `operator`, unexpectedAfterOperator))) { (arena, _) in
+      let layout: [RawSyntax?] = [unexpectedBeforeOperator?.raw, `operator`.raw, unexpectedAfterOperator?.raw]
       let raw = RawSyntax.makeLayout(
         kind: SyntaxKind.binaryOperatorExpr,
         from: layout,
@@ -733,7 +733,7 @@ public struct BinaryOperatorExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     self.init(data)
   }
   
-  public var unexpectedBeforeOperatorToken: UnexpectedNodesSyntax? {
+  public var unexpectedBeforeOperator: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 0, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -742,7 +742,7 @@ public struct BinaryOperatorExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var operatorToken: TokenSyntax {
+  public var `operator`: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 1, parent: Syntax(self))!)
     }
@@ -751,7 +751,7 @@ public struct BinaryOperatorExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedAfterOperatorToken: UnexpectedNodesSyntax? {
+  public var unexpectedAfterOperator: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -761,7 +761,7 @@ public struct BinaryOperatorExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
   }
   
   public static var structure: SyntaxNodeStructure {
-    return .layout([\Self.unexpectedBeforeOperatorToken, \Self.operatorToken, \Self.unexpectedAfterOperatorToken])
+    return .layout([\Self.unexpectedBeforeOperator, \Self.operator, \Self.unexpectedAfterOperator])
   }
 }
 
@@ -2025,7 +2025,7 @@ public struct EditorPlaceholderExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
 
 /// ### Children
 /// 
-///  - `floatingDigits`: `<floatingLiteral>`
+///  - `digits`: `<floatingLiteral>`
 public struct FloatLiteralExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
   public let _syntaxNode: Syntax
   
@@ -2046,16 +2046,16 @@ public struct FloatLiteralExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
   
   public init(
       leadingTrivia: Trivia? = nil,
-      _ unexpectedBeforeFloatingDigits: UnexpectedNodesSyntax? = nil,
-      floatingDigits: TokenSyntax,
-      _ unexpectedAfterFloatingDigits: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBeforeDigits: UnexpectedNodesSyntax? = nil,
+      digits: TokenSyntax,
+      _ unexpectedAfterDigits: UnexpectedNodesSyntax? = nil,
       trailingTrivia: Trivia? = nil
     
   ) {
     // Extend the lifetime of all parameters so their arenas don't get destroyed
     // before they can be added as children of the new arena.
-    let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (unexpectedBeforeFloatingDigits, floatingDigits, unexpectedAfterFloatingDigits))) { (arena, _) in
-      let layout: [RawSyntax?] = [unexpectedBeforeFloatingDigits?.raw, floatingDigits.raw, unexpectedAfterFloatingDigits?.raw]
+    let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (unexpectedBeforeDigits, digits, unexpectedAfterDigits))) { (arena, _) in
+      let layout: [RawSyntax?] = [unexpectedBeforeDigits?.raw, digits.raw, unexpectedAfterDigits?.raw]
       let raw = RawSyntax.makeLayout(
         kind: SyntaxKind.floatLiteralExpr,
         from: layout,
@@ -2069,7 +2069,7 @@ public struct FloatLiteralExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     self.init(data)
   }
   
-  public var unexpectedBeforeFloatingDigits: UnexpectedNodesSyntax? {
+  public var unexpectedBeforeDigits: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 0, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -2078,7 +2078,7 @@ public struct FloatLiteralExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var floatingDigits: TokenSyntax {
+  public var digits: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 1, parent: Syntax(self))!)
     }
@@ -2087,7 +2087,7 @@ public struct FloatLiteralExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedAfterFloatingDigits: UnexpectedNodesSyntax? {
+  public var unexpectedAfterDigits: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -2097,7 +2097,7 @@ public struct FloatLiteralExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
   }
   
   public static var structure: SyntaxNodeStructure {
-    return .layout([\Self.unexpectedBeforeFloatingDigits, \Self.floatingDigits, \Self.unexpectedAfterFloatingDigits])
+    return .layout([\Self.unexpectedBeforeDigits, \Self.digits, \Self.unexpectedAfterDigits])
   }
 }
 
@@ -3252,7 +3252,7 @@ public struct IntegerLiteralExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
 /// ### Children
 /// 
 ///  - `expression`: ``ExprSyntax``
-///  - `isTok`: `'is'`
+///  - `isKeyword`: `'is'`
 ///  - `typeName`: ``TypeSyntax``
 public struct IsExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
   public let _syntaxNode: Syntax
@@ -3276,9 +3276,9 @@ public struct IsExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
       leadingTrivia: Trivia? = nil,
       _ unexpectedBeforeExpression: UnexpectedNodesSyntax? = nil,
       expression: some ExprSyntaxProtocol,
-      _ unexpectedBetweenExpressionAndIsTok: UnexpectedNodesSyntax? = nil,
-      isTok: TokenSyntax = .keyword(.is),
-      _ unexpectedBetweenIsTokAndTypeName: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBetweenExpressionAndIsKeyword: UnexpectedNodesSyntax? = nil,
+      isKeyword: TokenSyntax = .keyword(.is),
+      _ unexpectedBetweenIsKeywordAndTypeName: UnexpectedNodesSyntax? = nil,
       typeName: some TypeSyntaxProtocol,
       _ unexpectedAfterTypeName: UnexpectedNodesSyntax? = nil,
       trailingTrivia: Trivia? = nil
@@ -3289,18 +3289,18 @@ public struct IsExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (
             unexpectedBeforeExpression, 
             expression, 
-            unexpectedBetweenExpressionAndIsTok, 
-            isTok, 
-            unexpectedBetweenIsTokAndTypeName, 
+            unexpectedBetweenExpressionAndIsKeyword, 
+            isKeyword, 
+            unexpectedBetweenIsKeywordAndTypeName, 
             typeName, 
             unexpectedAfterTypeName
           ))) { (arena, _) in
       let layout: [RawSyntax?] = [
           unexpectedBeforeExpression?.raw, 
           expression.raw, 
-          unexpectedBetweenExpressionAndIsTok?.raw, 
-          isTok.raw, 
-          unexpectedBetweenIsTokAndTypeName?.raw, 
+          unexpectedBetweenExpressionAndIsKeyword?.raw, 
+          isKeyword.raw, 
+          unexpectedBetweenIsKeywordAndTypeName?.raw, 
           typeName.raw, 
           unexpectedAfterTypeName?.raw
         ]
@@ -3336,7 +3336,7 @@ public struct IsExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenExpressionAndIsTok: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenExpressionAndIsKeyword: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -3346,7 +3346,7 @@ public struct IsExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
   }
   
   /// The `is` keyword for this expression.
-  public var isTok: TokenSyntax {
+  public var isKeyword: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 3, parent: Syntax(self))!)
     }
@@ -3355,7 +3355,7 @@ public struct IsExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenIsTokAndTypeName: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenIsKeywordAndTypeName: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 4, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -3387,9 +3387,9 @@ public struct IsExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     return .layout([
           \Self.unexpectedBeforeExpression, 
           \Self.expression, 
-          \Self.unexpectedBetweenExpressionAndIsTok, 
-          \Self.isTok, 
-          \Self.unexpectedBetweenIsTokAndTypeName, 
+          \Self.unexpectedBetweenExpressionAndIsKeyword, 
+          \Self.isKeyword, 
+          \Self.unexpectedBetweenIsKeywordAndTypeName, 
           \Self.typeName, 
           \Self.unexpectedAfterTypeName
         ])
@@ -3574,7 +3574,7 @@ public struct KeyPathExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
 
 /// ### Children
 /// 
-///  - `poundToken`: `'#'`
+///  - `pound`: `'#'`
 ///  - `macro`: `<identifier>`
 ///  - `genericArguments`: ``GenericArgumentClauseSyntax``?
 ///  - `leftParen`: `'('`?
@@ -3602,9 +3602,9 @@ public struct MacroExpansionExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
   
   public init(
       leadingTrivia: Trivia? = nil,
-      _ unexpectedBeforePoundToken: UnexpectedNodesSyntax? = nil,
-      poundToken: TokenSyntax = .poundToken(),
-      _ unexpectedBetweenPoundTokenAndMacro: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBeforePound: UnexpectedNodesSyntax? = nil,
+      pound: TokenSyntax = .poundToken(),
+      _ unexpectedBetweenPoundAndMacro: UnexpectedNodesSyntax? = nil,
       macro: TokenSyntax,
       _ unexpectedBetweenMacroAndGenericArguments: UnexpectedNodesSyntax? = nil,
       genericArguments: GenericArgumentClauseSyntax? = nil,
@@ -3625,9 +3625,9 @@ public struct MacroExpansionExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     // Extend the lifetime of all parameters so their arenas don't get destroyed
     // before they can be added as children of the new arena.
     let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (
-            unexpectedBeforePoundToken, 
-            poundToken, 
-            unexpectedBetweenPoundTokenAndMacro, 
+            unexpectedBeforePound, 
+            pound, 
+            unexpectedBetweenPoundAndMacro, 
             macro, 
             unexpectedBetweenMacroAndGenericArguments, 
             genericArguments, 
@@ -3644,9 +3644,9 @@ public struct MacroExpansionExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
             unexpectedAfterAdditionalTrailingClosures
           ))) { (arena, _) in
       let layout: [RawSyntax?] = [
-          unexpectedBeforePoundToken?.raw, 
-          poundToken.raw, 
-          unexpectedBetweenPoundTokenAndMacro?.raw, 
+          unexpectedBeforePound?.raw, 
+          pound.raw, 
+          unexpectedBetweenPoundAndMacro?.raw, 
           macro.raw, 
           unexpectedBetweenMacroAndGenericArguments?.raw, 
           genericArguments?.raw, 
@@ -3675,7 +3675,7 @@ public struct MacroExpansionExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     self.init(data)
   }
   
-  public var unexpectedBeforePoundToken: UnexpectedNodesSyntax? {
+  public var unexpectedBeforePound: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 0, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -3685,7 +3685,7 @@ public struct MacroExpansionExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
   }
   
   /// The `#` sign.
-  public var poundToken: TokenSyntax {
+  public var pound: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 1, parent: Syntax(self))!)
     }
@@ -3694,7 +3694,7 @@ public struct MacroExpansionExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenPoundTokenAndMacro: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenPoundAndMacro: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -3879,9 +3879,9 @@ public struct MacroExpansionExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
   
   public static var structure: SyntaxNodeStructure {
     return .layout([
-          \Self.unexpectedBeforePoundToken, 
-          \Self.poundToken, 
-          \Self.unexpectedBetweenPoundTokenAndMacro, 
+          \Self.unexpectedBeforePound, 
+          \Self.pound, 
+          \Self.unexpectedBetweenPoundAndMacro, 
           \Self.macro, 
           \Self.unexpectedBetweenMacroAndGenericArguments, 
           \Self.genericArguments, 
@@ -3907,7 +3907,7 @@ public struct MacroExpansionExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
 /// ### Children
 /// 
 ///  - `base`: ``ExprSyntax``?
-///  - `dot`: `'.'`
+///  - `period`: `'.'`
 ///  - `name`: ``TokenSyntax``
 ///  - `declNameArguments`: ``DeclNameArgumentsSyntax``?
 public struct MemberAccessExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
@@ -3932,9 +3932,9 @@ public struct MemberAccessExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
       leadingTrivia: Trivia? = nil,
       _ unexpectedBeforeBase: UnexpectedNodesSyntax? = nil,
       base: (some ExprSyntaxProtocol)? = ExprSyntax?.none,
-      _ unexpectedBetweenBaseAndDot: UnexpectedNodesSyntax? = nil,
-      dot: TokenSyntax = .periodToken(),
-      _ unexpectedBetweenDotAndName: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBetweenBaseAndPeriod: UnexpectedNodesSyntax? = nil,
+      period: TokenSyntax = .periodToken(),
+      _ unexpectedBetweenPeriodAndName: UnexpectedNodesSyntax? = nil,
       name: TokenSyntax,
       _ unexpectedBetweenNameAndDeclNameArguments: UnexpectedNodesSyntax? = nil,
       declNameArguments: DeclNameArgumentsSyntax? = nil,
@@ -3947,9 +3947,9 @@ public struct MemberAccessExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (
             unexpectedBeforeBase, 
             base, 
-            unexpectedBetweenBaseAndDot, 
-            dot, 
-            unexpectedBetweenDotAndName, 
+            unexpectedBetweenBaseAndPeriod, 
+            period, 
+            unexpectedBetweenPeriodAndName, 
             name, 
             unexpectedBetweenNameAndDeclNameArguments, 
             declNameArguments, 
@@ -3958,9 +3958,9 @@ public struct MemberAccessExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
       let layout: [RawSyntax?] = [
           unexpectedBeforeBase?.raw, 
           base?.raw, 
-          unexpectedBetweenBaseAndDot?.raw, 
-          dot.raw, 
-          unexpectedBetweenDotAndName?.raw, 
+          unexpectedBetweenBaseAndPeriod?.raw, 
+          period.raw, 
+          unexpectedBetweenPeriodAndName?.raw, 
           name.raw, 
           unexpectedBetweenNameAndDeclNameArguments?.raw, 
           declNameArguments?.raw, 
@@ -3997,7 +3997,7 @@ public struct MemberAccessExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenBaseAndDot: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenBaseAndPeriod: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -4006,7 +4006,7 @@ public struct MemberAccessExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var dot: TokenSyntax {
+  public var period: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 3, parent: Syntax(self))!)
     }
@@ -4015,7 +4015,7 @@ public struct MemberAccessExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenDotAndName: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenPeriodAndName: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 4, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -4064,9 +4064,9 @@ public struct MemberAccessExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     return .layout([
           \Self.unexpectedBeforeBase, 
           \Self.base, 
-          \Self.unexpectedBetweenBaseAndDot, 
-          \Self.dot, 
-          \Self.unexpectedBetweenDotAndName, 
+          \Self.unexpectedBetweenBaseAndPeriod, 
+          \Self.period, 
+          \Self.unexpectedBetweenPeriodAndName, 
           \Self.name, 
           \Self.unexpectedBetweenNameAndDeclNameArguments, 
           \Self.declNameArguments, 
@@ -4852,7 +4852,7 @@ public struct PostfixIfConfigExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
 /// ### Children
 /// 
 ///  - `expression`: ``ExprSyntax``
-///  - `operatorToken`: `<postfixOperator>`
+///  - `operator`: `<postfixOperator>`
 public struct PostfixUnaryExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
   public let _syntaxNode: Syntax
   
@@ -4875,9 +4875,9 @@ public struct PostfixUnaryExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
       leadingTrivia: Trivia? = nil,
       _ unexpectedBeforeExpression: UnexpectedNodesSyntax? = nil,
       expression: some ExprSyntaxProtocol,
-      _ unexpectedBetweenExpressionAndOperatorToken: UnexpectedNodesSyntax? = nil,
-      operatorToken: TokenSyntax,
-      _ unexpectedAfterOperatorToken: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBetweenExpressionAndOperator: UnexpectedNodesSyntax? = nil,
+      operator: TokenSyntax,
+      _ unexpectedAfterOperator: UnexpectedNodesSyntax? = nil,
       trailingTrivia: Trivia? = nil
     
   ) {
@@ -4886,16 +4886,16 @@ public struct PostfixUnaryExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (
             unexpectedBeforeExpression, 
             expression, 
-            unexpectedBetweenExpressionAndOperatorToken, 
-            operatorToken, 
-            unexpectedAfterOperatorToken
+            unexpectedBetweenExpressionAndOperator, 
+            `operator`, 
+            unexpectedAfterOperator
           ))) { (arena, _) in
       let layout: [RawSyntax?] = [
           unexpectedBeforeExpression?.raw, 
           expression.raw, 
-          unexpectedBetweenExpressionAndOperatorToken?.raw, 
-          operatorToken.raw, 
-          unexpectedAfterOperatorToken?.raw
+          unexpectedBetweenExpressionAndOperator?.raw, 
+          `operator`.raw, 
+          unexpectedAfterOperator?.raw
         ]
       let raw = RawSyntax.makeLayout(
         kind: SyntaxKind.postfixUnaryExpr,
@@ -4928,7 +4928,7 @@ public struct PostfixUnaryExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenExpressionAndOperatorToken: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenExpressionAndOperator: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -4937,7 +4937,7 @@ public struct PostfixUnaryExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var operatorToken: TokenSyntax {
+  public var `operator`: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 3, parent: Syntax(self))!)
     }
@@ -4946,7 +4946,7 @@ public struct PostfixUnaryExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedAfterOperatorToken: UnexpectedNodesSyntax? {
+  public var unexpectedAfterOperator: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 4, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -4959,9 +4959,9 @@ public struct PostfixUnaryExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     return .layout([
           \Self.unexpectedBeforeExpression, 
           \Self.expression, 
-          \Self.unexpectedBetweenExpressionAndOperatorToken, 
-          \Self.operatorToken, 
-          \Self.unexpectedAfterOperatorToken
+          \Self.unexpectedBetweenExpressionAndOperator, 
+          \Self.operator, 
+          \Self.unexpectedAfterOperator
         ])
   }
 }
@@ -4972,7 +4972,7 @@ public struct PostfixUnaryExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
 
 /// ### Children
 /// 
-///  - `operatorToken`: `<prefixOperator>`?
+///  - `operator`: `<prefixOperator>`?
 ///  - `postfixExpression`: ``ExprSyntax``
 public struct PrefixOperatorExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
   public let _syntaxNode: Syntax
@@ -4994,9 +4994,9 @@ public struct PrefixOperatorExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
   
   public init(
       leadingTrivia: Trivia? = nil,
-      _ unexpectedBeforeOperatorToken: UnexpectedNodesSyntax? = nil,
-      operatorToken: TokenSyntax? = nil,
-      _ unexpectedBetweenOperatorTokenAndPostfixExpression: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBeforeOperator: UnexpectedNodesSyntax? = nil,
+      operator: TokenSyntax? = nil,
+      _ unexpectedBetweenOperatorAndPostfixExpression: UnexpectedNodesSyntax? = nil,
       postfixExpression: some ExprSyntaxProtocol,
       _ unexpectedAfterPostfixExpression: UnexpectedNodesSyntax? = nil,
       trailingTrivia: Trivia? = nil
@@ -5005,16 +5005,16 @@ public struct PrefixOperatorExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     // Extend the lifetime of all parameters so their arenas don't get destroyed
     // before they can be added as children of the new arena.
     let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (
-            unexpectedBeforeOperatorToken, 
-            operatorToken, 
-            unexpectedBetweenOperatorTokenAndPostfixExpression, 
+            unexpectedBeforeOperator, 
+            `operator`, 
+            unexpectedBetweenOperatorAndPostfixExpression, 
             postfixExpression, 
             unexpectedAfterPostfixExpression
           ))) { (arena, _) in
       let layout: [RawSyntax?] = [
-          unexpectedBeforeOperatorToken?.raw, 
-          operatorToken?.raw, 
-          unexpectedBetweenOperatorTokenAndPostfixExpression?.raw, 
+          unexpectedBeforeOperator?.raw, 
+          `operator`?.raw, 
+          unexpectedBetweenOperatorAndPostfixExpression?.raw, 
           postfixExpression.raw, 
           unexpectedAfterPostfixExpression?.raw
         ]
@@ -5031,7 +5031,7 @@ public struct PrefixOperatorExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     self.init(data)
   }
   
-  public var unexpectedBeforeOperatorToken: UnexpectedNodesSyntax? {
+  public var unexpectedBeforeOperator: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 0, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -5040,7 +5040,7 @@ public struct PrefixOperatorExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var operatorToken: TokenSyntax? {
+  public var `operator`: TokenSyntax? {
     get {
       return data.child(at: 1, parent: Syntax(self)).map(TokenSyntax.init)
     }
@@ -5049,7 +5049,7 @@ public struct PrefixOperatorExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenOperatorTokenAndPostfixExpression: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenOperatorAndPostfixExpression: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -5078,9 +5078,9 @@ public struct PrefixOperatorExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
   
   public static var structure: SyntaxNodeStructure {
     return .layout([
-          \Self.unexpectedBeforeOperatorToken, 
-          \Self.operatorToken, 
-          \Self.unexpectedBetweenOperatorTokenAndPostfixExpression, 
+          \Self.unexpectedBeforeOperator, 
+          \Self.operator, 
+          \Self.unexpectedBetweenOperatorAndPostfixExpression, 
           \Self.postfixExpression, 
           \Self.unexpectedAfterPostfixExpression
         ])
@@ -5749,9 +5749,9 @@ public struct StringLiteralExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
 /// ### Children
 /// 
 ///  - `calledExpression`: ``ExprSyntax``
-///  - `leftBracket`: `'['`
+///  - `leftSquare`: `'['`
 ///  - `argumentList`: ``TupleExprElementListSyntax``
-///  - `rightBracket`: `']'`
+///  - `rightSquare`: `']'`
 ///  - `trailingClosure`: ``ClosureExprSyntax``?
 ///  - `additionalTrailingClosures`: ``MultipleTrailingClosureElementListSyntax``
 public struct SubscriptExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
@@ -5776,13 +5776,13 @@ public struct SubscriptExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
       leadingTrivia: Trivia? = nil,
       _ unexpectedBeforeCalledExpression: UnexpectedNodesSyntax? = nil,
       calledExpression: some ExprSyntaxProtocol,
-      _ unexpectedBetweenCalledExpressionAndLeftBracket: UnexpectedNodesSyntax? = nil,
-      leftBracket: TokenSyntax = .leftSquareToken(),
-      _ unexpectedBetweenLeftBracketAndArgumentList: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBetweenCalledExpressionAndLeftSquare: UnexpectedNodesSyntax? = nil,
+      leftSquare: TokenSyntax = .leftSquareToken(),
+      _ unexpectedBetweenLeftSquareAndArgumentList: UnexpectedNodesSyntax? = nil,
       argumentList: TupleExprElementListSyntax,
-      _ unexpectedBetweenArgumentListAndRightBracket: UnexpectedNodesSyntax? = nil,
-      rightBracket: TokenSyntax = .rightSquareToken(),
-      _ unexpectedBetweenRightBracketAndTrailingClosure: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBetweenArgumentListAndRightSquare: UnexpectedNodesSyntax? = nil,
+      rightSquare: TokenSyntax = .rightSquareToken(),
+      _ unexpectedBetweenRightSquareAndTrailingClosure: UnexpectedNodesSyntax? = nil,
       trailingClosure: ClosureExprSyntax? = nil,
       _ unexpectedBetweenTrailingClosureAndAdditionalTrailingClosures: UnexpectedNodesSyntax? = nil,
       additionalTrailingClosures: MultipleTrailingClosureElementListSyntax? = nil,
@@ -5795,13 +5795,13 @@ public struct SubscriptExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (
             unexpectedBeforeCalledExpression, 
             calledExpression, 
-            unexpectedBetweenCalledExpressionAndLeftBracket, 
-            leftBracket, 
-            unexpectedBetweenLeftBracketAndArgumentList, 
+            unexpectedBetweenCalledExpressionAndLeftSquare, 
+            leftSquare, 
+            unexpectedBetweenLeftSquareAndArgumentList, 
             argumentList, 
-            unexpectedBetweenArgumentListAndRightBracket, 
-            rightBracket, 
-            unexpectedBetweenRightBracketAndTrailingClosure, 
+            unexpectedBetweenArgumentListAndRightSquare, 
+            rightSquare, 
+            unexpectedBetweenRightSquareAndTrailingClosure, 
             trailingClosure, 
             unexpectedBetweenTrailingClosureAndAdditionalTrailingClosures, 
             additionalTrailingClosures, 
@@ -5810,13 +5810,13 @@ public struct SubscriptExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
       let layout: [RawSyntax?] = [
           unexpectedBeforeCalledExpression?.raw, 
           calledExpression.raw, 
-          unexpectedBetweenCalledExpressionAndLeftBracket?.raw, 
-          leftBracket.raw, 
-          unexpectedBetweenLeftBracketAndArgumentList?.raw, 
+          unexpectedBetweenCalledExpressionAndLeftSquare?.raw, 
+          leftSquare.raw, 
+          unexpectedBetweenLeftSquareAndArgumentList?.raw, 
           argumentList.raw, 
-          unexpectedBetweenArgumentListAndRightBracket?.raw, 
-          rightBracket.raw, 
-          unexpectedBetweenRightBracketAndTrailingClosure?.raw, 
+          unexpectedBetweenArgumentListAndRightSquare?.raw, 
+          rightSquare.raw, 
+          unexpectedBetweenRightSquareAndTrailingClosure?.raw, 
           trailingClosure?.raw, 
           unexpectedBetweenTrailingClosureAndAdditionalTrailingClosures?.raw, 
           additionalTrailingClosures?.raw, 
@@ -5853,7 +5853,7 @@ public struct SubscriptExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenCalledExpressionAndLeftBracket: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenCalledExpressionAndLeftSquare: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -5862,7 +5862,7 @@ public struct SubscriptExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var leftBracket: TokenSyntax {
+  public var leftSquare: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 3, parent: Syntax(self))!)
     }
@@ -5871,7 +5871,7 @@ public struct SubscriptExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenLeftBracketAndArgumentList: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenLeftSquareAndArgumentList: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 4, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -5913,7 +5913,7 @@ public struct SubscriptExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     return SubscriptExprSyntax(newData)
   }
   
-  public var unexpectedBetweenArgumentListAndRightBracket: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenArgumentListAndRightSquare: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 6, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -5922,7 +5922,7 @@ public struct SubscriptExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var rightBracket: TokenSyntax {
+  public var rightSquare: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 7, parent: Syntax(self))!)
     }
@@ -5931,7 +5931,7 @@ public struct SubscriptExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenRightBracketAndTrailingClosure: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenRightSquareAndTrailingClosure: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 8, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -6004,13 +6004,13 @@ public struct SubscriptExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     return .layout([
           \Self.unexpectedBeforeCalledExpression, 
           \Self.calledExpression, 
-          \Self.unexpectedBetweenCalledExpressionAndLeftBracket, 
-          \Self.leftBracket, 
-          \Self.unexpectedBetweenLeftBracketAndArgumentList, 
+          \Self.unexpectedBetweenCalledExpressionAndLeftSquare, 
+          \Self.leftSquare, 
+          \Self.unexpectedBetweenLeftSquareAndArgumentList, 
           \Self.argumentList, 
-          \Self.unexpectedBetweenArgumentListAndRightBracket, 
-          \Self.rightBracket, 
-          \Self.unexpectedBetweenRightBracketAndTrailingClosure, 
+          \Self.unexpectedBetweenArgumentListAndRightSquare, 
+          \Self.rightSquare, 
+          \Self.unexpectedBetweenRightSquareAndTrailingClosure, 
           \Self.trailingClosure, 
           \Self.unexpectedBetweenTrailingClosureAndAdditionalTrailingClosures, 
           \Self.additionalTrailingClosures, 
@@ -6336,7 +6336,7 @@ public struct SwitchExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
 ///  - `conditionExpression`: ``ExprSyntax``
 ///  - `questionMark`: `'?'`
 ///  - `firstChoice`: ``ExprSyntax``
-///  - `colonMark`: `':'`
+///  - `colon`: `':'`
 ///  - `secondChoice`: ``ExprSyntax``
 public struct TernaryExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
   public let _syntaxNode: Syntax
@@ -6364,9 +6364,9 @@ public struct TernaryExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
       questionMark: TokenSyntax = .infixQuestionMarkToken(),
       _ unexpectedBetweenQuestionMarkAndFirstChoice: UnexpectedNodesSyntax? = nil,
       firstChoice: some ExprSyntaxProtocol,
-      _ unexpectedBetweenFirstChoiceAndColonMark: UnexpectedNodesSyntax? = nil,
-      colonMark: TokenSyntax = .colonToken(),
-      _ unexpectedBetweenColonMarkAndSecondChoice: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBetweenFirstChoiceAndColon: UnexpectedNodesSyntax? = nil,
+      colon: TokenSyntax = .colonToken(),
+      _ unexpectedBetweenColonAndSecondChoice: UnexpectedNodesSyntax? = nil,
       secondChoice: some ExprSyntaxProtocol,
       _ unexpectedAfterSecondChoice: UnexpectedNodesSyntax? = nil,
       trailingTrivia: Trivia? = nil
@@ -6381,9 +6381,9 @@ public struct TernaryExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
             questionMark, 
             unexpectedBetweenQuestionMarkAndFirstChoice, 
             firstChoice, 
-            unexpectedBetweenFirstChoiceAndColonMark, 
-            colonMark, 
-            unexpectedBetweenColonMarkAndSecondChoice, 
+            unexpectedBetweenFirstChoiceAndColon, 
+            colon, 
+            unexpectedBetweenColonAndSecondChoice, 
             secondChoice, 
             unexpectedAfterSecondChoice
           ))) { (arena, _) in
@@ -6394,9 +6394,9 @@ public struct TernaryExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
           questionMark.raw, 
           unexpectedBetweenQuestionMarkAndFirstChoice?.raw, 
           firstChoice.raw, 
-          unexpectedBetweenFirstChoiceAndColonMark?.raw, 
-          colonMark.raw, 
-          unexpectedBetweenColonMarkAndSecondChoice?.raw, 
+          unexpectedBetweenFirstChoiceAndColon?.raw, 
+          colon.raw, 
+          unexpectedBetweenColonAndSecondChoice?.raw, 
           secondChoice.raw, 
           unexpectedAfterSecondChoice?.raw
         ]
@@ -6467,7 +6467,7 @@ public struct TernaryExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenFirstChoiceAndColonMark: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenFirstChoiceAndColon: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 6, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -6476,7 +6476,7 @@ public struct TernaryExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var colonMark: TokenSyntax {
+  public var colon: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 7, parent: Syntax(self))!)
     }
@@ -6485,7 +6485,7 @@ public struct TernaryExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenColonMarkAndSecondChoice: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenColonAndSecondChoice: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 8, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -6520,9 +6520,9 @@ public struct TernaryExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
           \Self.questionMark, 
           \Self.unexpectedBetweenQuestionMarkAndFirstChoice, 
           \Self.firstChoice, 
-          \Self.unexpectedBetweenFirstChoiceAndColonMark, 
-          \Self.colonMark, 
-          \Self.unexpectedBetweenColonMarkAndSecondChoice, 
+          \Self.unexpectedBetweenFirstChoiceAndColon, 
+          \Self.colon, 
+          \Self.unexpectedBetweenColonAndSecondChoice, 
           \Self.secondChoice, 
           \Self.unexpectedAfterSecondChoice
         ])
@@ -6937,7 +6937,7 @@ public struct TypeExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
 
 /// ### Children
 /// 
-///  - `asTok`: `'as'`
+///  - `asKeyword`: `'as'`
 ///  - `questionOrExclamationMark`: (`'?'` | `'!'`)?
 public struct UnresolvedAsExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
   public let _syntaxNode: Syntax
@@ -6959,9 +6959,9 @@ public struct UnresolvedAsExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
   
   public init(
       leadingTrivia: Trivia? = nil,
-      _ unexpectedBeforeAsTok: UnexpectedNodesSyntax? = nil,
-      asTok: TokenSyntax = .keyword(.as),
-      _ unexpectedBetweenAsTokAndQuestionOrExclamationMark: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBeforeAsKeyword: UnexpectedNodesSyntax? = nil,
+      asKeyword: TokenSyntax = .keyword(.as),
+      _ unexpectedBetweenAsKeywordAndQuestionOrExclamationMark: UnexpectedNodesSyntax? = nil,
       questionOrExclamationMark: TokenSyntax? = nil,
       _ unexpectedAfterQuestionOrExclamationMark: UnexpectedNodesSyntax? = nil,
       trailingTrivia: Trivia? = nil
@@ -6970,16 +6970,16 @@ public struct UnresolvedAsExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     // Extend the lifetime of all parameters so their arenas don't get destroyed
     // before they can be added as children of the new arena.
     let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (
-            unexpectedBeforeAsTok, 
-            asTok, 
-            unexpectedBetweenAsTokAndQuestionOrExclamationMark, 
+            unexpectedBeforeAsKeyword, 
+            asKeyword, 
+            unexpectedBetweenAsKeywordAndQuestionOrExclamationMark, 
             questionOrExclamationMark, 
             unexpectedAfterQuestionOrExclamationMark
           ))) { (arena, _) in
       let layout: [RawSyntax?] = [
-          unexpectedBeforeAsTok?.raw, 
-          asTok.raw, 
-          unexpectedBetweenAsTokAndQuestionOrExclamationMark?.raw, 
+          unexpectedBeforeAsKeyword?.raw, 
+          asKeyword.raw, 
+          unexpectedBetweenAsKeywordAndQuestionOrExclamationMark?.raw, 
           questionOrExclamationMark?.raw, 
           unexpectedAfterQuestionOrExclamationMark?.raw
         ]
@@ -6996,7 +6996,7 @@ public struct UnresolvedAsExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     self.init(data)
   }
   
-  public var unexpectedBeforeAsTok: UnexpectedNodesSyntax? {
+  public var unexpectedBeforeAsKeyword: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 0, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -7005,7 +7005,7 @@ public struct UnresolvedAsExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var asTok: TokenSyntax {
+  public var asKeyword: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 1, parent: Syntax(self))!)
     }
@@ -7014,7 +7014,7 @@ public struct UnresolvedAsExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenAsTokAndQuestionOrExclamationMark: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenAsKeywordAndQuestionOrExclamationMark: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -7043,9 +7043,9 @@ public struct UnresolvedAsExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
   
   public static var structure: SyntaxNodeStructure {
     return .layout([
-          \Self.unexpectedBeforeAsTok, 
-          \Self.asTok, 
-          \Self.unexpectedBetweenAsTokAndQuestionOrExclamationMark, 
+          \Self.unexpectedBeforeAsKeyword, 
+          \Self.asKeyword, 
+          \Self.unexpectedBetweenAsKeywordAndQuestionOrExclamationMark, 
           \Self.questionOrExclamationMark, 
           \Self.unexpectedAfterQuestionOrExclamationMark
         ])
@@ -7058,7 +7058,7 @@ public struct UnresolvedAsExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
 
 /// ### Children
 /// 
-///  - `isTok`: `'is'`
+///  - `isKeyword`: `'is'`
 public struct UnresolvedIsExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
   public let _syntaxNode: Syntax
   
@@ -7079,16 +7079,16 @@ public struct UnresolvedIsExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
   
   public init(
       leadingTrivia: Trivia? = nil,
-      _ unexpectedBeforeIsTok: UnexpectedNodesSyntax? = nil,
-      isTok: TokenSyntax = .keyword(.is),
-      _ unexpectedAfterIsTok: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBeforeIsKeyword: UnexpectedNodesSyntax? = nil,
+      isKeyword: TokenSyntax = .keyword(.is),
+      _ unexpectedAfterIsKeyword: UnexpectedNodesSyntax? = nil,
       trailingTrivia: Trivia? = nil
     
   ) {
     // Extend the lifetime of all parameters so their arenas don't get destroyed
     // before they can be added as children of the new arena.
-    let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (unexpectedBeforeIsTok, isTok, unexpectedAfterIsTok))) { (arena, _) in
-      let layout: [RawSyntax?] = [unexpectedBeforeIsTok?.raw, isTok.raw, unexpectedAfterIsTok?.raw]
+    let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (unexpectedBeforeIsKeyword, isKeyword, unexpectedAfterIsKeyword))) { (arena, _) in
+      let layout: [RawSyntax?] = [unexpectedBeforeIsKeyword?.raw, isKeyword.raw, unexpectedAfterIsKeyword?.raw]
       let raw = RawSyntax.makeLayout(
         kind: SyntaxKind.unresolvedIsExpr,
         from: layout,
@@ -7102,7 +7102,7 @@ public struct UnresolvedIsExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     self.init(data)
   }
   
-  public var unexpectedBeforeIsTok: UnexpectedNodesSyntax? {
+  public var unexpectedBeforeIsKeyword: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 0, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -7111,7 +7111,7 @@ public struct UnresolvedIsExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var isTok: TokenSyntax {
+  public var isKeyword: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 1, parent: Syntax(self))!)
     }
@@ -7120,7 +7120,7 @@ public struct UnresolvedIsExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedAfterIsTok: UnexpectedNodesSyntax? {
+  public var unexpectedAfterIsKeyword: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -7130,7 +7130,7 @@ public struct UnresolvedIsExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
   }
   
   public static var structure: SyntaxNodeStructure {
-    return .layout([\Self.unexpectedBeforeIsTok, \Self.isTok, \Self.unexpectedAfterIsTok])
+    return .layout([\Self.unexpectedBeforeIsKeyword, \Self.isKeyword, \Self.unexpectedAfterIsKeyword])
   }
 }
 
@@ -7224,7 +7224,7 @@ public struct UnresolvedPatternExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
 /// 
 ///  - `questionMark`: `'?'`
 ///  - `firstChoice`: ``ExprSyntax``
-///  - `colonMark`: `':'`
+///  - `colon`: `':'`
 public struct UnresolvedTernaryExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
   public let _syntaxNode: Syntax
   
@@ -7249,9 +7249,9 @@ public struct UnresolvedTernaryExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
       questionMark: TokenSyntax = .infixQuestionMarkToken(),
       _ unexpectedBetweenQuestionMarkAndFirstChoice: UnexpectedNodesSyntax? = nil,
       firstChoice: some ExprSyntaxProtocol,
-      _ unexpectedBetweenFirstChoiceAndColonMark: UnexpectedNodesSyntax? = nil,
-      colonMark: TokenSyntax = .colonToken(),
-      _ unexpectedAfterColonMark: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBetweenFirstChoiceAndColon: UnexpectedNodesSyntax? = nil,
+      colon: TokenSyntax = .colonToken(),
+      _ unexpectedAfterColon: UnexpectedNodesSyntax? = nil,
       trailingTrivia: Trivia? = nil
     
   ) {
@@ -7262,18 +7262,18 @@ public struct UnresolvedTernaryExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
             questionMark, 
             unexpectedBetweenQuestionMarkAndFirstChoice, 
             firstChoice, 
-            unexpectedBetweenFirstChoiceAndColonMark, 
-            colonMark, 
-            unexpectedAfterColonMark
+            unexpectedBetweenFirstChoiceAndColon, 
+            colon, 
+            unexpectedAfterColon
           ))) { (arena, _) in
       let layout: [RawSyntax?] = [
           unexpectedBeforeQuestionMark?.raw, 
           questionMark.raw, 
           unexpectedBetweenQuestionMarkAndFirstChoice?.raw, 
           firstChoice.raw, 
-          unexpectedBetweenFirstChoiceAndColonMark?.raw, 
-          colonMark.raw, 
-          unexpectedAfterColonMark?.raw
+          unexpectedBetweenFirstChoiceAndColon?.raw, 
+          colon.raw, 
+          unexpectedAfterColon?.raw
         ]
       let raw = RawSyntax.makeLayout(
         kind: SyntaxKind.unresolvedTernaryExpr,
@@ -7324,7 +7324,7 @@ public struct UnresolvedTernaryExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenFirstChoiceAndColonMark: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenFirstChoiceAndColon: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 4, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -7333,7 +7333,7 @@ public struct UnresolvedTernaryExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var colonMark: TokenSyntax {
+  public var colon: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 5, parent: Syntax(self))!)
     }
@@ -7342,7 +7342,7 @@ public struct UnresolvedTernaryExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedAfterColonMark: UnexpectedNodesSyntax? {
+  public var unexpectedAfterColon: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 6, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -7357,9 +7357,9 @@ public struct UnresolvedTernaryExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
           \Self.questionMark, 
           \Self.unexpectedBetweenQuestionMarkAndFirstChoice, 
           \Self.firstChoice, 
-          \Self.unexpectedBetweenFirstChoiceAndColonMark, 
-          \Self.colonMark, 
-          \Self.unexpectedAfterColonMark
+          \Self.unexpectedBetweenFirstChoiceAndColon, 
+          \Self.colon, 
+          \Self.unexpectedAfterColon
         ])
   }
 }
diff --git a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodes.swift b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodes.swift
index ccfe90849d4..0de38e3cf92 100644
--- a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodes.swift
+++ b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodes.swift
@@ -900,7 +900,7 @@ public struct ArrayElementSyntax: SyntaxProtocol, SyntaxHashable {
 ///
 /// ### Children
 /// 
-///  - `atSignToken`: `'@'`
+///  - `atSign`: `'@'`
 ///  - `attributeName`: ``TypeSyntax``
 ///  - `leftParen`: `'('`?
 ///  - `argument`: (``TupleExprElementListSyntax`` | ``TokenSyntax`` | ``StringLiteralExprSyntax`` | ``AvailabilitySpecListSyntax`` | ``SpecializeAttributeSpecListSyntax`` | ``ObjCSelectorSyntax`` | ``ImplementsAttributeArgumentsSyntax`` | ``DifferentiableAttributeArgumentsSyntax`` | ``DerivativeRegistrationAttributeArgumentsSyntax`` | ``BackDeployedAttributeSpecListSyntax`` | ``ConventionAttributeArgumentsSyntax`` | ``ConventionWitnessMethodAttributeArgumentsSyntax`` | ``OpaqueReturnTypeOfAttributeArgumentsSyntax`` | ``ExposeAttributeArgumentsSyntax`` | ``OriginallyDefinedInArgumentsSyntax`` | ``UnderscorePrivateAttributeArgumentsSyntax`` | ``DynamicReplacementArgumentsSyntax`` | ``UnavailableFromAsyncArgumentsSyntax`` | ``EffectsArgumentsSyntax`` | ``DocumentationAttributeArgumentsSyntax``)?
@@ -1186,9 +1186,9 @@ public struct AttributeSyntax: SyntaxProtocol, SyntaxHashable {
   
   public init(
       leadingTrivia: Trivia? = nil,
-      _ unexpectedBeforeAtSignToken: UnexpectedNodesSyntax? = nil,
-      atSignToken: TokenSyntax = .atSignToken(),
-      _ unexpectedBetweenAtSignTokenAndAttributeName: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBeforeAtSign: UnexpectedNodesSyntax? = nil,
+      atSign: TokenSyntax = .atSignToken(),
+      _ unexpectedBetweenAtSignAndAttributeName: UnexpectedNodesSyntax? = nil,
       attributeName: some TypeSyntaxProtocol,
       _ unexpectedBetweenAttributeNameAndLeftParen: UnexpectedNodesSyntax? = nil,
       leftParen: TokenSyntax? = nil,
@@ -1203,9 +1203,9 @@ public struct AttributeSyntax: SyntaxProtocol, SyntaxHashable {
     // Extend the lifetime of all parameters so their arenas don't get destroyed
     // before they can be added as children of the new arena.
     let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (
-            unexpectedBeforeAtSignToken, 
-            atSignToken, 
-            unexpectedBetweenAtSignTokenAndAttributeName, 
+            unexpectedBeforeAtSign, 
+            atSign, 
+            unexpectedBetweenAtSignAndAttributeName, 
             attributeName, 
             unexpectedBetweenAttributeNameAndLeftParen, 
             leftParen, 
@@ -1216,9 +1216,9 @@ public struct AttributeSyntax: SyntaxProtocol, SyntaxHashable {
             unexpectedAfterRightParen
           ))) { (arena, _) in
       let layout: [RawSyntax?] = [
-          unexpectedBeforeAtSignToken?.raw, 
-          atSignToken.raw, 
-          unexpectedBetweenAtSignTokenAndAttributeName?.raw, 
+          unexpectedBeforeAtSign?.raw, 
+          atSign.raw, 
+          unexpectedBetweenAtSignAndAttributeName?.raw, 
           attributeName.raw, 
           unexpectedBetweenAttributeNameAndLeftParen?.raw, 
           leftParen?.raw, 
@@ -1241,7 +1241,7 @@ public struct AttributeSyntax: SyntaxProtocol, SyntaxHashable {
     self.init(data)
   }
   
-  public var unexpectedBeforeAtSignToken: UnexpectedNodesSyntax? {
+  public var unexpectedBeforeAtSign: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 0, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -1251,7 +1251,7 @@ public struct AttributeSyntax: SyntaxProtocol, SyntaxHashable {
   }
   
   /// The `@` sign.
-  public var atSignToken: TokenSyntax {
+  public var atSign: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 1, parent: Syntax(self))!)
     }
@@ -1260,7 +1260,7 @@ public struct AttributeSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenAtSignTokenAndAttributeName: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenAtSignAndAttributeName: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -1347,9 +1347,9 @@ public struct AttributeSyntax: SyntaxProtocol, SyntaxHashable {
   
   public static var structure: SyntaxNodeStructure {
     return .layout([
-          \Self.unexpectedBeforeAtSignToken, 
-          \Self.atSignToken, 
-          \Self.unexpectedBetweenAtSignTokenAndAttributeName, 
+          \Self.unexpectedBeforeAtSign, 
+          \Self.atSign, 
+          \Self.unexpectedBetweenAtSignAndAttributeName, 
           \Self.attributeName, 
           \Self.unexpectedBetweenAttributeNameAndLeftParen, 
           \Self.leftParen, 
@@ -1743,7 +1743,7 @@ public struct AvailabilityConditionSyntax: SyntaxProtocol, SyntaxHashable {
 ///
 /// ### Children
 /// 
-///  - `label`: `'availability'`
+///  - `availabilityLabel`: `'availability'`
 ///  - `colon`: `':'`
 ///  - `availabilityArguments`: ``AvailabilitySpecListSyntax``
 ///  - `semicolon`: `';'`
@@ -1767,9 +1767,9 @@ public struct AvailabilityEntrySyntax: SyntaxProtocol, SyntaxHashable {
   
   public init(
       leadingTrivia: Trivia? = nil,
-      _ unexpectedBeforeLabel: UnexpectedNodesSyntax? = nil,
-      label: TokenSyntax = .keyword(.availability),
-      _ unexpectedBetweenLabelAndColon: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBeforeAvailabilityLabel: UnexpectedNodesSyntax? = nil,
+      availabilityLabel: TokenSyntax = .keyword(.availability),
+      _ unexpectedBetweenAvailabilityLabelAndColon: UnexpectedNodesSyntax? = nil,
       colon: TokenSyntax = .colonToken(),
       _ unexpectedBetweenColonAndAvailabilityArguments: UnexpectedNodesSyntax? = nil,
       availabilityArguments: AvailabilitySpecListSyntax,
@@ -1782,9 +1782,9 @@ public struct AvailabilityEntrySyntax: SyntaxProtocol, SyntaxHashable {
     // Extend the lifetime of all parameters so their arenas don't get destroyed
     // before they can be added as children of the new arena.
     let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (
-            unexpectedBeforeLabel, 
-            label, 
-            unexpectedBetweenLabelAndColon, 
+            unexpectedBeforeAvailabilityLabel, 
+            availabilityLabel, 
+            unexpectedBetweenAvailabilityLabelAndColon, 
             colon, 
             unexpectedBetweenColonAndAvailabilityArguments, 
             availabilityArguments, 
@@ -1793,9 +1793,9 @@ public struct AvailabilityEntrySyntax: SyntaxProtocol, SyntaxHashable {
             unexpectedAfterSemicolon
           ))) { (arena, _) in
       let layout: [RawSyntax?] = [
-          unexpectedBeforeLabel?.raw, 
-          label.raw, 
-          unexpectedBetweenLabelAndColon?.raw, 
+          unexpectedBeforeAvailabilityLabel?.raw, 
+          availabilityLabel.raw, 
+          unexpectedBetweenAvailabilityLabelAndColon?.raw, 
           colon.raw, 
           unexpectedBetweenColonAndAvailabilityArguments?.raw, 
           availabilityArguments.raw, 
@@ -1816,7 +1816,7 @@ public struct AvailabilityEntrySyntax: SyntaxProtocol, SyntaxHashable {
     self.init(data)
   }
   
-  public var unexpectedBeforeLabel: UnexpectedNodesSyntax? {
+  public var unexpectedBeforeAvailabilityLabel: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 0, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -1826,7 +1826,7 @@ public struct AvailabilityEntrySyntax: SyntaxProtocol, SyntaxHashable {
   }
   
   /// The label of the argument
-  public var label: TokenSyntax {
+  public var availabilityLabel: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 1, parent: Syntax(self))!)
     }
@@ -1835,7 +1835,7 @@ public struct AvailabilityEntrySyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenLabelAndColon: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenAvailabilityLabelAndColon: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -1925,9 +1925,9 @@ public struct AvailabilityEntrySyntax: SyntaxProtocol, SyntaxHashable {
   
   public static var structure: SyntaxNodeStructure {
     return .layout([
-          \Self.unexpectedBeforeLabel, 
-          \Self.label, 
-          \Self.unexpectedBetweenLabelAndColon, 
+          \Self.unexpectedBeforeAvailabilityLabel, 
+          \Self.availabilityLabel, 
+          \Self.unexpectedBetweenAvailabilityLabelAndColon, 
           \Self.colon, 
           \Self.unexpectedBetweenColonAndAvailabilityArguments, 
           \Self.availabilityArguments, 
@@ -3201,7 +3201,7 @@ public struct ClosureCaptureItemSpecifierSyntax: SyntaxProtocol, SyntaxHashable
 /// 
 ///  - `specifier`: ``ClosureCaptureItemSpecifierSyntax``?
 ///  - `name`: `<identifier>`?
-///  - `assignToken`: `'='`?
+///  - `equal`: `'='`?
 ///  - `expression`: ``ExprSyntax``
 ///  - `trailingComma`: `','`?
 public struct ClosureCaptureItemSyntax: SyntaxProtocol, SyntaxHashable {
@@ -3228,9 +3228,9 @@ public struct ClosureCaptureItemSyntax: SyntaxProtocol, SyntaxHashable {
       specifier: ClosureCaptureItemSpecifierSyntax? = nil,
       _ unexpectedBetweenSpecifierAndName: UnexpectedNodesSyntax? = nil,
       name: TokenSyntax? = nil,
-      _ unexpectedBetweenNameAndAssignToken: UnexpectedNodesSyntax? = nil,
-      assignToken: TokenSyntax? = nil,
-      _ unexpectedBetweenAssignTokenAndExpression: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBetweenNameAndEqual: UnexpectedNodesSyntax? = nil,
+      equal: TokenSyntax? = nil,
+      _ unexpectedBetweenEqualAndExpression: UnexpectedNodesSyntax? = nil,
       expression: some ExprSyntaxProtocol,
       _ unexpectedBetweenExpressionAndTrailingComma: UnexpectedNodesSyntax? = nil,
       trailingComma: TokenSyntax? = nil,
@@ -3245,9 +3245,9 @@ public struct ClosureCaptureItemSyntax: SyntaxProtocol, SyntaxHashable {
             specifier, 
             unexpectedBetweenSpecifierAndName, 
             name, 
-            unexpectedBetweenNameAndAssignToken, 
-            assignToken, 
-            unexpectedBetweenAssignTokenAndExpression, 
+            unexpectedBetweenNameAndEqual, 
+            equal, 
+            unexpectedBetweenEqualAndExpression, 
             expression, 
             unexpectedBetweenExpressionAndTrailingComma, 
             trailingComma, 
@@ -3258,9 +3258,9 @@ public struct ClosureCaptureItemSyntax: SyntaxProtocol, SyntaxHashable {
           specifier?.raw, 
           unexpectedBetweenSpecifierAndName?.raw, 
           name?.raw, 
-          unexpectedBetweenNameAndAssignToken?.raw, 
-          assignToken?.raw, 
-          unexpectedBetweenAssignTokenAndExpression?.raw, 
+          unexpectedBetweenNameAndEqual?.raw, 
+          equal?.raw, 
+          unexpectedBetweenEqualAndExpression?.raw, 
           expression.raw, 
           unexpectedBetweenExpressionAndTrailingComma?.raw, 
           trailingComma?.raw, 
@@ -3315,7 +3315,7 @@ public struct ClosureCaptureItemSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenNameAndAssignToken: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenNameAndEqual: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 4, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -3324,7 +3324,7 @@ public struct ClosureCaptureItemSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var assignToken: TokenSyntax? {
+  public var equal: TokenSyntax? {
     get {
       return data.child(at: 5, parent: Syntax(self)).map(TokenSyntax.init)
     }
@@ -3333,7 +3333,7 @@ public struct ClosureCaptureItemSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenAssignTokenAndExpression: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenEqualAndExpression: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 6, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -3384,9 +3384,9 @@ public struct ClosureCaptureItemSyntax: SyntaxProtocol, SyntaxHashable {
           \Self.specifier, 
           \Self.unexpectedBetweenSpecifierAndName, 
           \Self.name, 
-          \Self.unexpectedBetweenNameAndAssignToken, 
-          \Self.assignToken, 
-          \Self.unexpectedBetweenAssignTokenAndExpression, 
+          \Self.unexpectedBetweenNameAndEqual, 
+          \Self.equal, 
+          \Self.unexpectedBetweenEqualAndExpression, 
           \Self.expression, 
           \Self.unexpectedBetweenExpressionAndTrailingComma, 
           \Self.trailingComma, 
@@ -4211,7 +4211,7 @@ public struct ClosureParameterSyntax: SyntaxProtocol, SyntaxHashable {
 ///  - `input`: (``ClosureParamListSyntax`` | ``ClosureParameterClauseSyntax``)?
 ///  - `effectSpecifiers`: ``TypeEffectSpecifiersSyntax``?
 ///  - `output`: ``ReturnClauseSyntax``?
-///  - `inTok`: `'in'`
+///  - `inKeyword`: `'in'`
 public struct ClosureSignatureSyntax: SyntaxProtocol, SyntaxHashable {
   public enum Input: SyntaxChildChoices {
     case `simpleInput`(ClosureParamListSyntax)
@@ -4284,9 +4284,9 @@ public struct ClosureSignatureSyntax: SyntaxProtocol, SyntaxHashable {
       effectSpecifiers: TypeEffectSpecifiersSyntax? = nil,
       _ unexpectedBetweenEffectSpecifiersAndOutput: UnexpectedNodesSyntax? = nil,
       output: ReturnClauseSyntax? = nil,
-      _ unexpectedBetweenOutputAndInTok: UnexpectedNodesSyntax? = nil,
-      inTok: TokenSyntax = .keyword(.in),
-      _ unexpectedAfterInTok: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBetweenOutputAndInKeyword: UnexpectedNodesSyntax? = nil,
+      inKeyword: TokenSyntax = .keyword(.in),
+      _ unexpectedAfterInKeyword: UnexpectedNodesSyntax? = nil,
       trailingTrivia: Trivia? = nil
     
   ) {
@@ -4303,9 +4303,9 @@ public struct ClosureSignatureSyntax: SyntaxProtocol, SyntaxHashable {
             effectSpecifiers, 
             unexpectedBetweenEffectSpecifiersAndOutput, 
             output, 
-            unexpectedBetweenOutputAndInTok, 
-            inTok, 
-            unexpectedAfterInTok
+            unexpectedBetweenOutputAndInKeyword, 
+            inKeyword, 
+            unexpectedAfterInKeyword
           ))) { (arena, _) in
       let layout: [RawSyntax?] = [
           unexpectedBeforeAttributes?.raw, 
@@ -4318,9 +4318,9 @@ public struct ClosureSignatureSyntax: SyntaxProtocol, SyntaxHashable {
           effectSpecifiers?.raw, 
           unexpectedBetweenEffectSpecifiersAndOutput?.raw, 
           output?.raw, 
-          unexpectedBetweenOutputAndInTok?.raw, 
-          inTok.raw, 
-          unexpectedAfterInTok?.raw
+          unexpectedBetweenOutputAndInKeyword?.raw, 
+          inKeyword.raw, 
+          unexpectedAfterInKeyword?.raw
         ]
       let raw = RawSyntax.makeLayout(
         kind: SyntaxKind.closureSignature,
@@ -4449,7 +4449,7 @@ public struct ClosureSignatureSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenOutputAndInTok: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenOutputAndInKeyword: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 10, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -4458,7 +4458,7 @@ public struct ClosureSignatureSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var inTok: TokenSyntax {
+  public var inKeyword: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 11, parent: Syntax(self))!)
     }
@@ -4467,7 +4467,7 @@ public struct ClosureSignatureSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedAfterInTok: UnexpectedNodesSyntax? {
+  public var unexpectedAfterInKeyword: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 12, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -4488,9 +4488,9 @@ public struct ClosureSignatureSyntax: SyntaxProtocol, SyntaxHashable {
           \Self.effectSpecifiers, 
           \Self.unexpectedBetweenEffectSpecifiersAndOutput, 
           \Self.output, 
-          \Self.unexpectedBetweenOutputAndInTok, 
-          \Self.inTok, 
-          \Self.unexpectedAfterInTok
+          \Self.unexpectedBetweenOutputAndInKeyword, 
+          \Self.inKeyword, 
+          \Self.unexpectedAfterInKeyword
         ])
   }
 }
@@ -8826,7 +8826,7 @@ public struct ExposeAttributeArgumentsSyntax: SyntaxProtocol, SyntaxHashable {
 /// ### Children
 /// 
 ///  - `backslash`: `'\'`
-///  - `delimiter`: `<rawStringDelimiter>`?
+///  - `rawStringDelimiter`: `<rawStringDelimiter>`?
 ///  - `leftParen`: `'('`
 ///  - `expressions`: ``TupleExprElementListSyntax``
 ///  - `rightParen`: `')'`
@@ -8852,9 +8852,9 @@ public struct ExpressionSegmentSyntax: SyntaxProtocol, SyntaxHashable {
       leadingTrivia: Trivia? = nil,
       _ unexpectedBeforeBackslash: UnexpectedNodesSyntax? = nil,
       backslash: TokenSyntax = .backslashToken(),
-      _ unexpectedBetweenBackslashAndDelimiter: UnexpectedNodesSyntax? = nil,
-      delimiter: TokenSyntax? = nil,
-      _ unexpectedBetweenDelimiterAndLeftParen: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBetweenBackslashAndRawStringDelimiter: UnexpectedNodesSyntax? = nil,
+      rawStringDelimiter: TokenSyntax? = nil,
+      _ unexpectedBetweenRawStringDelimiterAndLeftParen: UnexpectedNodesSyntax? = nil,
       leftParen: TokenSyntax = .leftParenToken(),
       _ unexpectedBetweenLeftParenAndExpressions: UnexpectedNodesSyntax? = nil,
       expressions: TupleExprElementListSyntax,
@@ -8869,9 +8869,9 @@ public struct ExpressionSegmentSyntax: SyntaxProtocol, SyntaxHashable {
     let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (
             unexpectedBeforeBackslash, 
             backslash, 
-            unexpectedBetweenBackslashAndDelimiter, 
-            delimiter, 
-            unexpectedBetweenDelimiterAndLeftParen, 
+            unexpectedBetweenBackslashAndRawStringDelimiter, 
+            rawStringDelimiter, 
+            unexpectedBetweenRawStringDelimiterAndLeftParen, 
             leftParen, 
             unexpectedBetweenLeftParenAndExpressions, 
             expressions, 
@@ -8882,9 +8882,9 @@ public struct ExpressionSegmentSyntax: SyntaxProtocol, SyntaxHashable {
       let layout: [RawSyntax?] = [
           unexpectedBeforeBackslash?.raw, 
           backslash.raw, 
-          unexpectedBetweenBackslashAndDelimiter?.raw, 
-          delimiter?.raw, 
-          unexpectedBetweenDelimiterAndLeftParen?.raw, 
+          unexpectedBetweenBackslashAndRawStringDelimiter?.raw, 
+          rawStringDelimiter?.raw, 
+          unexpectedBetweenRawStringDelimiterAndLeftParen?.raw, 
           leftParen.raw, 
           unexpectedBetweenLeftParenAndExpressions?.raw, 
           expressions.raw, 
@@ -8923,7 +8923,7 @@ public struct ExpressionSegmentSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenBackslashAndDelimiter: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenBackslashAndRawStringDelimiter: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -8932,7 +8932,7 @@ public struct ExpressionSegmentSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var delimiter: TokenSyntax? {
+  public var rawStringDelimiter: TokenSyntax? {
     get {
       return data.child(at: 3, parent: Syntax(self)).map(TokenSyntax.init)
     }
@@ -8941,7 +8941,7 @@ public struct ExpressionSegmentSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenDelimiterAndLeftParen: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenRawStringDelimiterAndLeftParen: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 4, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -9032,9 +9032,9 @@ public struct ExpressionSegmentSyntax: SyntaxProtocol, SyntaxHashable {
     return .layout([
           \Self.unexpectedBeforeBackslash, 
           \Self.backslash, 
-          \Self.unexpectedBetweenBackslashAndDelimiter, 
-          \Self.delimiter, 
-          \Self.unexpectedBetweenDelimiterAndLeftParen, 
+          \Self.unexpectedBetweenBackslashAndRawStringDelimiter, 
+          \Self.rawStringDelimiter, 
+          \Self.unexpectedBetweenRawStringDelimiterAndLeftParen, 
           \Self.leftParen, 
           \Self.unexpectedBetweenLeftParenAndExpressions, 
           \Self.expressions, 
@@ -9678,9 +9678,9 @@ public struct FunctionSignatureSyntax: SyntaxProtocol, SyntaxHashable {
 
 /// ### Children
 /// 
-///  - `leftAngleBracket`: `'<'`
+///  - `leftAngle`: `'<'`
 ///  - `arguments`: ``GenericArgumentListSyntax``
-///  - `rightAngleBracket`: `'>'`
+///  - `rightAngle`: `'>'`
 public struct GenericArgumentClauseSyntax: SyntaxProtocol, SyntaxHashable {
   public let _syntaxNode: Syntax
   
@@ -9701,35 +9701,35 @@ public struct GenericArgumentClauseSyntax: SyntaxProtocol, SyntaxHashable {
   
   public init(
       leadingTrivia: Trivia? = nil,
-      _ unexpectedBeforeLeftAngleBracket: UnexpectedNodesSyntax? = nil,
-      leftAngleBracket: TokenSyntax = .leftAngleToken(),
-      _ unexpectedBetweenLeftAngleBracketAndArguments: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBeforeLeftAngle: UnexpectedNodesSyntax? = nil,
+      leftAngle: TokenSyntax = .leftAngleToken(),
+      _ unexpectedBetweenLeftAngleAndArguments: UnexpectedNodesSyntax? = nil,
       arguments: GenericArgumentListSyntax,
-      _ unexpectedBetweenArgumentsAndRightAngleBracket: UnexpectedNodesSyntax? = nil,
-      rightAngleBracket: TokenSyntax = .rightAngleToken(),
-      _ unexpectedAfterRightAngleBracket: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBetweenArgumentsAndRightAngle: UnexpectedNodesSyntax? = nil,
+      rightAngle: TokenSyntax = .rightAngleToken(),
+      _ unexpectedAfterRightAngle: UnexpectedNodesSyntax? = nil,
       trailingTrivia: Trivia? = nil
     
   ) {
     // Extend the lifetime of all parameters so their arenas don't get destroyed
     // before they can be added as children of the new arena.
     let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (
-            unexpectedBeforeLeftAngleBracket, 
-            leftAngleBracket, 
-            unexpectedBetweenLeftAngleBracketAndArguments, 
+            unexpectedBeforeLeftAngle, 
+            leftAngle, 
+            unexpectedBetweenLeftAngleAndArguments, 
             arguments, 
-            unexpectedBetweenArgumentsAndRightAngleBracket, 
-            rightAngleBracket, 
-            unexpectedAfterRightAngleBracket
+            unexpectedBetweenArgumentsAndRightAngle, 
+            rightAngle, 
+            unexpectedAfterRightAngle
           ))) { (arena, _) in
       let layout: [RawSyntax?] = [
-          unexpectedBeforeLeftAngleBracket?.raw, 
-          leftAngleBracket.raw, 
-          unexpectedBetweenLeftAngleBracketAndArguments?.raw, 
+          unexpectedBeforeLeftAngle?.raw, 
+          leftAngle.raw, 
+          unexpectedBetweenLeftAngleAndArguments?.raw, 
           arguments.raw, 
-          unexpectedBetweenArgumentsAndRightAngleBracket?.raw, 
-          rightAngleBracket.raw, 
-          unexpectedAfterRightAngleBracket?.raw
+          unexpectedBetweenArgumentsAndRightAngle?.raw, 
+          rightAngle.raw, 
+          unexpectedAfterRightAngle?.raw
         ]
       let raw = RawSyntax.makeLayout(
         kind: SyntaxKind.genericArgumentClause,
@@ -9744,7 +9744,7 @@ public struct GenericArgumentClauseSyntax: SyntaxProtocol, SyntaxHashable {
     self.init(data)
   }
   
-  public var unexpectedBeforeLeftAngleBracket: UnexpectedNodesSyntax? {
+  public var unexpectedBeforeLeftAngle: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 0, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -9753,7 +9753,7 @@ public struct GenericArgumentClauseSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var leftAngleBracket: TokenSyntax {
+  public var leftAngle: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 1, parent: Syntax(self))!)
     }
@@ -9762,7 +9762,7 @@ public struct GenericArgumentClauseSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenLeftAngleBracketAndArguments: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenLeftAngleAndArguments: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -9804,7 +9804,7 @@ public struct GenericArgumentClauseSyntax: SyntaxProtocol, SyntaxHashable {
     return GenericArgumentClauseSyntax(newData)
   }
   
-  public var unexpectedBetweenArgumentsAndRightAngleBracket: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenArgumentsAndRightAngle: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 4, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -9813,7 +9813,7 @@ public struct GenericArgumentClauseSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var rightAngleBracket: TokenSyntax {
+  public var rightAngle: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 5, parent: Syntax(self))!)
     }
@@ -9822,7 +9822,7 @@ public struct GenericArgumentClauseSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedAfterRightAngleBracket: UnexpectedNodesSyntax? {
+  public var unexpectedAfterRightAngle: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 6, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -9833,13 +9833,13 @@ public struct GenericArgumentClauseSyntax: SyntaxProtocol, SyntaxHashable {
   
   public static var structure: SyntaxNodeStructure {
     return .layout([
-          \Self.unexpectedBeforeLeftAngleBracket, 
-          \Self.leftAngleBracket, 
-          \Self.unexpectedBetweenLeftAngleBracketAndArguments, 
+          \Self.unexpectedBeforeLeftAngle, 
+          \Self.leftAngle, 
+          \Self.unexpectedBetweenLeftAngleAndArguments, 
           \Self.arguments, 
-          \Self.unexpectedBetweenArgumentsAndRightAngleBracket, 
-          \Self.rightAngleBracket, 
-          \Self.unexpectedAfterRightAngleBracket
+          \Self.unexpectedBetweenArgumentsAndRightAngle, 
+          \Self.rightAngle, 
+          \Self.unexpectedAfterRightAngle
         ])
   }
 }
@@ -9971,10 +9971,10 @@ public struct GenericArgumentSyntax: SyntaxProtocol, SyntaxHashable {
 
 /// ### Children
 /// 
-///  - `leftAngleBracket`: `'<'`
+///  - `leftAngle`: `'<'`
 ///  - `parameters`: ``GenericParameterListSyntax``
 ///  - `genericWhereClause`: ``GenericWhereClauseSyntax``?
-///  - `rightAngleBracket`: `'>'`
+///  - `rightAngle`: `'>'`
 public struct GenericParameterClauseSyntax: SyntaxProtocol, SyntaxHashable {
   public let _syntaxNode: Syntax
   
@@ -9995,41 +9995,41 @@ public struct GenericParameterClauseSyntax: SyntaxProtocol, SyntaxHashable {
   
   public init(
       leadingTrivia: Trivia? = nil,
-      _ unexpectedBeforeLeftAngleBracket: UnexpectedNodesSyntax? = nil,
-      leftAngleBracket: TokenSyntax = .leftAngleToken(),
-      _ unexpectedBetweenLeftAngleBracketAndParameters: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBeforeLeftAngle: UnexpectedNodesSyntax? = nil,
+      leftAngle: TokenSyntax = .leftAngleToken(),
+      _ unexpectedBetweenLeftAngleAndParameters: UnexpectedNodesSyntax? = nil,
       parameters: GenericParameterListSyntax,
       _ unexpectedBetweenParametersAndGenericWhereClause: UnexpectedNodesSyntax? = nil,
       genericWhereClause: GenericWhereClauseSyntax? = nil,
-      _ unexpectedBetweenGenericWhereClauseAndRightAngleBracket: UnexpectedNodesSyntax? = nil,
-      rightAngleBracket: TokenSyntax = .rightAngleToken(),
-      _ unexpectedAfterRightAngleBracket: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBetweenGenericWhereClauseAndRightAngle: UnexpectedNodesSyntax? = nil,
+      rightAngle: TokenSyntax = .rightAngleToken(),
+      _ unexpectedAfterRightAngle: UnexpectedNodesSyntax? = nil,
       trailingTrivia: Trivia? = nil
     
   ) {
     // Extend the lifetime of all parameters so their arenas don't get destroyed
     // before they can be added as children of the new arena.
     let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (
-            unexpectedBeforeLeftAngleBracket, 
-            leftAngleBracket, 
-            unexpectedBetweenLeftAngleBracketAndParameters, 
+            unexpectedBeforeLeftAngle, 
+            leftAngle, 
+            unexpectedBetweenLeftAngleAndParameters, 
             parameters, 
             unexpectedBetweenParametersAndGenericWhereClause, 
             genericWhereClause, 
-            unexpectedBetweenGenericWhereClauseAndRightAngleBracket, 
-            rightAngleBracket, 
-            unexpectedAfterRightAngleBracket
+            unexpectedBetweenGenericWhereClauseAndRightAngle, 
+            rightAngle, 
+            unexpectedAfterRightAngle
           ))) { (arena, _) in
       let layout: [RawSyntax?] = [
-          unexpectedBeforeLeftAngleBracket?.raw, 
-          leftAngleBracket.raw, 
-          unexpectedBetweenLeftAngleBracketAndParameters?.raw, 
+          unexpectedBeforeLeftAngle?.raw, 
+          leftAngle.raw, 
+          unexpectedBetweenLeftAngleAndParameters?.raw, 
           parameters.raw, 
           unexpectedBetweenParametersAndGenericWhereClause?.raw, 
           genericWhereClause?.raw, 
-          unexpectedBetweenGenericWhereClauseAndRightAngleBracket?.raw, 
-          rightAngleBracket.raw, 
-          unexpectedAfterRightAngleBracket?.raw
+          unexpectedBetweenGenericWhereClauseAndRightAngle?.raw, 
+          rightAngle.raw, 
+          unexpectedAfterRightAngle?.raw
         ]
       let raw = RawSyntax.makeLayout(
         kind: SyntaxKind.genericParameterClause,
@@ -10044,7 +10044,7 @@ public struct GenericParameterClauseSyntax: SyntaxProtocol, SyntaxHashable {
     self.init(data)
   }
   
-  public var unexpectedBeforeLeftAngleBracket: UnexpectedNodesSyntax? {
+  public var unexpectedBeforeLeftAngle: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 0, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -10053,7 +10053,7 @@ public struct GenericParameterClauseSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var leftAngleBracket: TokenSyntax {
+  public var leftAngle: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 1, parent: Syntax(self))!)
     }
@@ -10062,7 +10062,7 @@ public struct GenericParameterClauseSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenLeftAngleBracketAndParameters: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenLeftAngleAndParameters: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -10122,7 +10122,7 @@ public struct GenericParameterClauseSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenGenericWhereClauseAndRightAngleBracket: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenGenericWhereClauseAndRightAngle: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 6, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -10131,7 +10131,7 @@ public struct GenericParameterClauseSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var rightAngleBracket: TokenSyntax {
+  public var rightAngle: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 7, parent: Syntax(self))!)
     }
@@ -10140,7 +10140,7 @@ public struct GenericParameterClauseSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedAfterRightAngleBracket: UnexpectedNodesSyntax? {
+  public var unexpectedAfterRightAngle: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 8, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -10151,15 +10151,15 @@ public struct GenericParameterClauseSyntax: SyntaxProtocol, SyntaxHashable {
   
   public static var structure: SyntaxNodeStructure {
     return .layout([
-          \Self.unexpectedBeforeLeftAngleBracket, 
-          \Self.leftAngleBracket, 
-          \Self.unexpectedBetweenLeftAngleBracketAndParameters, 
+          \Self.unexpectedBeforeLeftAngle, 
+          \Self.leftAngle, 
+          \Self.unexpectedBetweenLeftAngleAndParameters, 
           \Self.parameters, 
           \Self.unexpectedBetweenParametersAndGenericWhereClause, 
           \Self.genericWhereClause, 
-          \Self.unexpectedBetweenGenericWhereClauseAndRightAngleBracket, 
-          \Self.rightAngleBracket, 
-          \Self.unexpectedAfterRightAngleBracket
+          \Self.unexpectedBetweenGenericWhereClauseAndRightAngle, 
+          \Self.rightAngle, 
+          \Self.unexpectedAfterRightAngle
         ])
   }
 }
@@ -10171,7 +10171,7 @@ public struct GenericParameterClauseSyntax: SyntaxProtocol, SyntaxHashable {
 /// ### Children
 /// 
 ///  - `attributes`: ``AttributeListSyntax``
-///  - `each`: `'each'`?
+///  - `eachKeyword`: `'each'`?
 ///  - `name`: `<identifier>`
 ///  - `colon`: `':'`?
 ///  - `inheritedType`: ``TypeSyntax``?
@@ -10198,9 +10198,9 @@ public struct GenericParameterSyntax: SyntaxProtocol, SyntaxHashable {
       leadingTrivia: Trivia? = nil,
       _ unexpectedBeforeAttributes: UnexpectedNodesSyntax? = nil,
       attributes: AttributeListSyntax? = nil,
-      _ unexpectedBetweenAttributesAndEach: UnexpectedNodesSyntax? = nil,
-      each: TokenSyntax? = nil,
-      _ unexpectedBetweenEachAndName: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBetweenAttributesAndEachKeyword: UnexpectedNodesSyntax? = nil,
+      eachKeyword: TokenSyntax? = nil,
+      _ unexpectedBetweenEachKeywordAndName: UnexpectedNodesSyntax? = nil,
       name: TokenSyntax,
       _ unexpectedBetweenNameAndColon: UnexpectedNodesSyntax? = nil,
       colon: TokenSyntax? = nil,
@@ -10217,9 +10217,9 @@ public struct GenericParameterSyntax: SyntaxProtocol, SyntaxHashable {
     let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (
             unexpectedBeforeAttributes, 
             attributes, 
-            unexpectedBetweenAttributesAndEach, 
-            each, 
-            unexpectedBetweenEachAndName, 
+            unexpectedBetweenAttributesAndEachKeyword, 
+            eachKeyword, 
+            unexpectedBetweenEachKeywordAndName, 
             name, 
             unexpectedBetweenNameAndColon, 
             colon, 
@@ -10232,9 +10232,9 @@ public struct GenericParameterSyntax: SyntaxProtocol, SyntaxHashable {
       let layout: [RawSyntax?] = [
           unexpectedBeforeAttributes?.raw, 
           attributes?.raw, 
-          unexpectedBetweenAttributesAndEach?.raw, 
-          each?.raw, 
-          unexpectedBetweenEachAndName?.raw, 
+          unexpectedBetweenAttributesAndEachKeyword?.raw, 
+          eachKeyword?.raw, 
+          unexpectedBetweenEachKeywordAndName?.raw, 
           name.raw, 
           unexpectedBetweenNameAndColon?.raw, 
           colon?.raw, 
@@ -10299,7 +10299,7 @@ public struct GenericParameterSyntax: SyntaxProtocol, SyntaxHashable {
     return GenericParameterSyntax(newData)
   }
   
-  public var unexpectedBetweenAttributesAndEach: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenAttributesAndEachKeyword: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -10308,7 +10308,7 @@ public struct GenericParameterSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var each: TokenSyntax? {
+  public var eachKeyword: TokenSyntax? {
     get {
       return data.child(at: 3, parent: Syntax(self)).map(TokenSyntax.init)
     }
@@ -10317,7 +10317,7 @@ public struct GenericParameterSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenEachAndName: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenEachKeywordAndName: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 4, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -10402,9 +10402,9 @@ public struct GenericParameterSyntax: SyntaxProtocol, SyntaxHashable {
     return .layout([
           \Self.unexpectedBeforeAttributes, 
           \Self.attributes, 
-          \Self.unexpectedBetweenAttributesAndEach, 
-          \Self.each, 
-          \Self.unexpectedBetweenEachAndName, 
+          \Self.unexpectedBetweenAttributesAndEachKeyword, 
+          \Self.eachKeyword, 
+          \Self.unexpectedBetweenEachKeywordAndName, 
           \Self.name, 
           \Self.unexpectedBetweenNameAndColon, 
           \Self.colon, 
@@ -11151,7 +11151,7 @@ public struct ImplementsAttributeArgumentsSyntax: SyntaxProtocol, SyntaxHashable
 /// ### Children
 /// 
 ///  - `name`: (`<identifier>` | `<binaryOperator>` | `<prefixOperator>` | `<postfixOperator>`)
-///  - `trailingDot`: `'.'`?
+///  - `trailingPeriod`: `'.'`?
 public struct ImportPathComponentSyntax: SyntaxProtocol, SyntaxHashable {
   public let _syntaxNode: Syntax
   
@@ -11174,9 +11174,9 @@ public struct ImportPathComponentSyntax: SyntaxProtocol, SyntaxHashable {
       leadingTrivia: Trivia? = nil,
       _ unexpectedBeforeName: UnexpectedNodesSyntax? = nil,
       name: TokenSyntax,
-      _ unexpectedBetweenNameAndTrailingDot: UnexpectedNodesSyntax? = nil,
-      trailingDot: TokenSyntax? = nil,
-      _ unexpectedAfterTrailingDot: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBetweenNameAndTrailingPeriod: UnexpectedNodesSyntax? = nil,
+      trailingPeriod: TokenSyntax? = nil,
+      _ unexpectedAfterTrailingPeriod: UnexpectedNodesSyntax? = nil,
       trailingTrivia: Trivia? = nil
     
   ) {
@@ -11185,16 +11185,16 @@ public struct ImportPathComponentSyntax: SyntaxProtocol, SyntaxHashable {
     let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (
             unexpectedBeforeName, 
             name, 
-            unexpectedBetweenNameAndTrailingDot, 
-            trailingDot, 
-            unexpectedAfterTrailingDot
+            unexpectedBetweenNameAndTrailingPeriod, 
+            trailingPeriod, 
+            unexpectedAfterTrailingPeriod
           ))) { (arena, _) in
       let layout: [RawSyntax?] = [
           unexpectedBeforeName?.raw, 
           name.raw, 
-          unexpectedBetweenNameAndTrailingDot?.raw, 
-          trailingDot?.raw, 
-          unexpectedAfterTrailingDot?.raw
+          unexpectedBetweenNameAndTrailingPeriod?.raw, 
+          trailingPeriod?.raw, 
+          unexpectedAfterTrailingPeriod?.raw
         ]
       let raw = RawSyntax.makeLayout(
         kind: SyntaxKind.importPathComponent,
@@ -11227,7 +11227,7 @@ public struct ImportPathComponentSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenNameAndTrailingDot: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenNameAndTrailingPeriod: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -11236,7 +11236,7 @@ public struct ImportPathComponentSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var trailingDot: TokenSyntax? {
+  public var trailingPeriod: TokenSyntax? {
     get {
       return data.child(at: 3, parent: Syntax(self)).map(TokenSyntax.init)
     }
@@ -11245,7 +11245,7 @@ public struct ImportPathComponentSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedAfterTrailingDot: UnexpectedNodesSyntax? {
+  public var unexpectedAfterTrailingPeriod: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 4, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -11258,9 +11258,9 @@ public struct ImportPathComponentSyntax: SyntaxProtocol, SyntaxHashable {
     return .layout([
           \Self.unexpectedBeforeName, 
           \Self.name, 
-          \Self.unexpectedBetweenNameAndTrailingDot, 
-          \Self.trailingDot, 
-          \Self.unexpectedAfterTrailingDot
+          \Self.unexpectedBetweenNameAndTrailingPeriod, 
+          \Self.trailingPeriod, 
+          \Self.unexpectedAfterTrailingPeriod
         ])
   }
 }
@@ -12116,9 +12116,9 @@ public struct KeyPathPropertyComponentSyntax: SyntaxProtocol, SyntaxHashable {
 
 /// ### Children
 /// 
-///  - `leftBracket`: `'['`
+///  - `leftSquare`: `'['`
 ///  - `argumentList`: ``TupleExprElementListSyntax``
-///  - `rightBracket`: `']'`
+///  - `rightSquare`: `']'`
 public struct KeyPathSubscriptComponentSyntax: SyntaxProtocol, SyntaxHashable {
   public let _syntaxNode: Syntax
   
@@ -12139,35 +12139,35 @@ public struct KeyPathSubscriptComponentSyntax: SyntaxProtocol, SyntaxHashable {
   
   public init(
       leadingTrivia: Trivia? = nil,
-      _ unexpectedBeforeLeftBracket: UnexpectedNodesSyntax? = nil,
-      leftBracket: TokenSyntax = .leftSquareToken(),
-      _ unexpectedBetweenLeftBracketAndArgumentList: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBeforeLeftSquare: UnexpectedNodesSyntax? = nil,
+      leftSquare: TokenSyntax = .leftSquareToken(),
+      _ unexpectedBetweenLeftSquareAndArgumentList: UnexpectedNodesSyntax? = nil,
       argumentList: TupleExprElementListSyntax,
-      _ unexpectedBetweenArgumentListAndRightBracket: UnexpectedNodesSyntax? = nil,
-      rightBracket: TokenSyntax = .rightSquareToken(),
-      _ unexpectedAfterRightBracket: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBetweenArgumentListAndRightSquare: UnexpectedNodesSyntax? = nil,
+      rightSquare: TokenSyntax = .rightSquareToken(),
+      _ unexpectedAfterRightSquare: UnexpectedNodesSyntax? = nil,
       trailingTrivia: Trivia? = nil
     
   ) {
     // Extend the lifetime of all parameters so their arenas don't get destroyed
     // before they can be added as children of the new arena.
     let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (
-            unexpectedBeforeLeftBracket, 
-            leftBracket, 
-            unexpectedBetweenLeftBracketAndArgumentList, 
+            unexpectedBeforeLeftSquare, 
+            leftSquare, 
+            unexpectedBetweenLeftSquareAndArgumentList, 
             argumentList, 
-            unexpectedBetweenArgumentListAndRightBracket, 
-            rightBracket, 
-            unexpectedAfterRightBracket
+            unexpectedBetweenArgumentListAndRightSquare, 
+            rightSquare, 
+            unexpectedAfterRightSquare
           ))) { (arena, _) in
       let layout: [RawSyntax?] = [
-          unexpectedBeforeLeftBracket?.raw, 
-          leftBracket.raw, 
-          unexpectedBetweenLeftBracketAndArgumentList?.raw, 
+          unexpectedBeforeLeftSquare?.raw, 
+          leftSquare.raw, 
+          unexpectedBetweenLeftSquareAndArgumentList?.raw, 
           argumentList.raw, 
-          unexpectedBetweenArgumentListAndRightBracket?.raw, 
-          rightBracket.raw, 
-          unexpectedAfterRightBracket?.raw
+          unexpectedBetweenArgumentListAndRightSquare?.raw, 
+          rightSquare.raw, 
+          unexpectedAfterRightSquare?.raw
         ]
       let raw = RawSyntax.makeLayout(
         kind: SyntaxKind.keyPathSubscriptComponent,
@@ -12182,7 +12182,7 @@ public struct KeyPathSubscriptComponentSyntax: SyntaxProtocol, SyntaxHashable {
     self.init(data)
   }
   
-  public var unexpectedBeforeLeftBracket: UnexpectedNodesSyntax? {
+  public var unexpectedBeforeLeftSquare: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 0, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -12191,7 +12191,7 @@ public struct KeyPathSubscriptComponentSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var leftBracket: TokenSyntax {
+  public var leftSquare: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 1, parent: Syntax(self))!)
     }
@@ -12200,7 +12200,7 @@ public struct KeyPathSubscriptComponentSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenLeftBracketAndArgumentList: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenLeftSquareAndArgumentList: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -12242,7 +12242,7 @@ public struct KeyPathSubscriptComponentSyntax: SyntaxProtocol, SyntaxHashable {
     return KeyPathSubscriptComponentSyntax(newData)
   }
   
-  public var unexpectedBetweenArgumentListAndRightBracket: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenArgumentListAndRightSquare: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 4, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -12251,7 +12251,7 @@ public struct KeyPathSubscriptComponentSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var rightBracket: TokenSyntax {
+  public var rightSquare: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 5, parent: Syntax(self))!)
     }
@@ -12260,7 +12260,7 @@ public struct KeyPathSubscriptComponentSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedAfterRightBracket: UnexpectedNodesSyntax? {
+  public var unexpectedAfterRightSquare: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 6, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -12271,13 +12271,13 @@ public struct KeyPathSubscriptComponentSyntax: SyntaxProtocol, SyntaxHashable {
   
   public static var structure: SyntaxNodeStructure {
     return .layout([
-          \Self.unexpectedBeforeLeftBracket, 
-          \Self.leftBracket, 
-          \Self.unexpectedBetweenLeftBracketAndArgumentList, 
+          \Self.unexpectedBeforeLeftSquare, 
+          \Self.leftSquare, 
+          \Self.unexpectedBetweenLeftSquareAndArgumentList, 
           \Self.argumentList, 
-          \Self.unexpectedBetweenArgumentListAndRightBracket, 
-          \Self.rightBracket, 
-          \Self.unexpectedAfterRightBracket
+          \Self.unexpectedBetweenArgumentListAndRightSquare, 
+          \Self.rightSquare, 
+          \Self.unexpectedAfterRightSquare
         ])
   }
 }
@@ -14713,12 +14713,12 @@ public struct PatternBindingSyntax: SyntaxProtocol, SyntaxHashable {
 
 /// ### Children
 /// 
-///  - `fileArgLabel`: `'file'`
-///  - `fileArgColon`: `':'`
+///  - `fileLabel`: `'file'`
+///  - `fileColon`: `':'`
 ///  - `fileName`: ``StringLiteralExprSyntax``
 ///  - `comma`: `','`
-///  - `lineArgLabel`: `'line'`
-///  - `lineArgColon`: `':'`
+///  - `lineLabel`: `'line'`
+///  - `lineColon`: `':'`
 ///  - `lineNumber`: `<integerLiteral>`
 public struct PoundSourceLocationArgsSyntax: SyntaxProtocol, SyntaxHashable {
   public let _syntaxNode: Syntax
@@ -14740,19 +14740,19 @@ public struct PoundSourceLocationArgsSyntax: SyntaxProtocol, SyntaxHashable {
   
   public init(
       leadingTrivia: Trivia? = nil,
-      _ unexpectedBeforeFileArgLabel: UnexpectedNodesSyntax? = nil,
-      fileArgLabel: TokenSyntax = .keyword(.file),
-      _ unexpectedBetweenFileArgLabelAndFileArgColon: UnexpectedNodesSyntax? = nil,
-      fileArgColon: TokenSyntax = .colonToken(),
-      _ unexpectedBetweenFileArgColonAndFileName: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBeforeFileLabel: UnexpectedNodesSyntax? = nil,
+      fileLabel: TokenSyntax = .keyword(.file),
+      _ unexpectedBetweenFileLabelAndFileColon: UnexpectedNodesSyntax? = nil,
+      fileColon: TokenSyntax = .colonToken(),
+      _ unexpectedBetweenFileColonAndFileName: UnexpectedNodesSyntax? = nil,
       fileName: StringLiteralExprSyntax,
       _ unexpectedBetweenFileNameAndComma: UnexpectedNodesSyntax? = nil,
       comma: TokenSyntax = .commaToken(),
-      _ unexpectedBetweenCommaAndLineArgLabel: UnexpectedNodesSyntax? = nil,
-      lineArgLabel: TokenSyntax = .keyword(.line),
-      _ unexpectedBetweenLineArgLabelAndLineArgColon: UnexpectedNodesSyntax? = nil,
-      lineArgColon: TokenSyntax = .colonToken(),
-      _ unexpectedBetweenLineArgColonAndLineNumber: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBetweenCommaAndLineLabel: UnexpectedNodesSyntax? = nil,
+      lineLabel: TokenSyntax = .keyword(.line),
+      _ unexpectedBetweenLineLabelAndLineColon: UnexpectedNodesSyntax? = nil,
+      lineColon: TokenSyntax = .colonToken(),
+      _ unexpectedBetweenLineColonAndLineNumber: UnexpectedNodesSyntax? = nil,
       lineNumber: TokenSyntax,
       _ unexpectedAfterLineNumber: UnexpectedNodesSyntax? = nil,
       trailingTrivia: Trivia? = nil
@@ -14761,36 +14761,36 @@ public struct PoundSourceLocationArgsSyntax: SyntaxProtocol, SyntaxHashable {
     // Extend the lifetime of all parameters so their arenas don't get destroyed
     // before they can be added as children of the new arena.
     let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (
-            unexpectedBeforeFileArgLabel, 
-            fileArgLabel, 
-            unexpectedBetweenFileArgLabelAndFileArgColon, 
-            fileArgColon, 
-            unexpectedBetweenFileArgColonAndFileName, 
+            unexpectedBeforeFileLabel, 
+            fileLabel, 
+            unexpectedBetweenFileLabelAndFileColon, 
+            fileColon, 
+            unexpectedBetweenFileColonAndFileName, 
             fileName, 
             unexpectedBetweenFileNameAndComma, 
             comma, 
-            unexpectedBetweenCommaAndLineArgLabel, 
-            lineArgLabel, 
-            unexpectedBetweenLineArgLabelAndLineArgColon, 
-            lineArgColon, 
-            unexpectedBetweenLineArgColonAndLineNumber, 
+            unexpectedBetweenCommaAndLineLabel, 
+            lineLabel, 
+            unexpectedBetweenLineLabelAndLineColon, 
+            lineColon, 
+            unexpectedBetweenLineColonAndLineNumber, 
             lineNumber, 
             unexpectedAfterLineNumber
           ))) { (arena, _) in
       let layout: [RawSyntax?] = [
-          unexpectedBeforeFileArgLabel?.raw, 
-          fileArgLabel.raw, 
-          unexpectedBetweenFileArgLabelAndFileArgColon?.raw, 
-          fileArgColon.raw, 
-          unexpectedBetweenFileArgColonAndFileName?.raw, 
+          unexpectedBeforeFileLabel?.raw, 
+          fileLabel.raw, 
+          unexpectedBetweenFileLabelAndFileColon?.raw, 
+          fileColon.raw, 
+          unexpectedBetweenFileColonAndFileName?.raw, 
           fileName.raw, 
           unexpectedBetweenFileNameAndComma?.raw, 
           comma.raw, 
-          unexpectedBetweenCommaAndLineArgLabel?.raw, 
-          lineArgLabel.raw, 
-          unexpectedBetweenLineArgLabelAndLineArgColon?.raw, 
-          lineArgColon.raw, 
-          unexpectedBetweenLineArgColonAndLineNumber?.raw, 
+          unexpectedBetweenCommaAndLineLabel?.raw, 
+          lineLabel.raw, 
+          unexpectedBetweenLineLabelAndLineColon?.raw, 
+          lineColon.raw, 
+          unexpectedBetweenLineColonAndLineNumber?.raw, 
           lineNumber.raw, 
           unexpectedAfterLineNumber?.raw
         ]
@@ -14807,7 +14807,7 @@ public struct PoundSourceLocationArgsSyntax: SyntaxProtocol, SyntaxHashable {
     self.init(data)
   }
   
-  public var unexpectedBeforeFileArgLabel: UnexpectedNodesSyntax? {
+  public var unexpectedBeforeFileLabel: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 0, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -14816,7 +14816,7 @@ public struct PoundSourceLocationArgsSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var fileArgLabel: TokenSyntax {
+  public var fileLabel: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 1, parent: Syntax(self))!)
     }
@@ -14825,7 +14825,7 @@ public struct PoundSourceLocationArgsSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenFileArgLabelAndFileArgColon: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenFileLabelAndFileColon: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -14834,7 +14834,7 @@ public struct PoundSourceLocationArgsSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var fileArgColon: TokenSyntax {
+  public var fileColon: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 3, parent: Syntax(self))!)
     }
@@ -14843,7 +14843,7 @@ public struct PoundSourceLocationArgsSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenFileArgColonAndFileName: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenFileColonAndFileName: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 4, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -14879,7 +14879,7 @@ public struct PoundSourceLocationArgsSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenCommaAndLineArgLabel: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenCommaAndLineLabel: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 8, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -14888,7 +14888,7 @@ public struct PoundSourceLocationArgsSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var lineArgLabel: TokenSyntax {
+  public var lineLabel: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 9, parent: Syntax(self))!)
     }
@@ -14897,7 +14897,7 @@ public struct PoundSourceLocationArgsSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenLineArgLabelAndLineArgColon: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenLineLabelAndLineColon: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 10, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -14906,7 +14906,7 @@ public struct PoundSourceLocationArgsSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var lineArgColon: TokenSyntax {
+  public var lineColon: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 11, parent: Syntax(self))!)
     }
@@ -14915,7 +14915,7 @@ public struct PoundSourceLocationArgsSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenLineArgColonAndLineNumber: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenLineColonAndLineNumber: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 12, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -14944,19 +14944,19 @@ public struct PoundSourceLocationArgsSyntax: SyntaxProtocol, SyntaxHashable {
   
   public static var structure: SyntaxNodeStructure {
     return .layout([
-          \Self.unexpectedBeforeFileArgLabel, 
-          \Self.fileArgLabel, 
-          \Self.unexpectedBetweenFileArgLabelAndFileArgColon, 
-          \Self.fileArgColon, 
-          \Self.unexpectedBetweenFileArgColonAndFileName, 
+          \Self.unexpectedBeforeFileLabel, 
+          \Self.fileLabel, 
+          \Self.unexpectedBetweenFileLabelAndFileColon, 
+          \Self.fileColon, 
+          \Self.unexpectedBetweenFileColonAndFileName, 
           \Self.fileName, 
           \Self.unexpectedBetweenFileNameAndComma, 
           \Self.comma, 
-          \Self.unexpectedBetweenCommaAndLineArgLabel, 
-          \Self.lineArgLabel, 
-          \Self.unexpectedBetweenLineArgLabelAndLineArgColon, 
-          \Self.lineArgColon, 
-          \Self.unexpectedBetweenLineArgColonAndLineNumber, 
+          \Self.unexpectedBetweenCommaAndLineLabel, 
+          \Self.lineLabel, 
+          \Self.unexpectedBetweenLineLabelAndLineColon, 
+          \Self.lineColon, 
+          \Self.unexpectedBetweenLineColonAndLineNumber, 
           \Self.lineNumber, 
           \Self.unexpectedAfterLineNumber
         ])
@@ -14969,7 +14969,7 @@ public struct PoundSourceLocationArgsSyntax: SyntaxProtocol, SyntaxHashable {
 ///
 /// ### Children
 /// 
-///  - `assignmentKeyword`: `'assignment'`
+///  - `assignmentLabel`: `'assignment'`
 ///  - `colon`: `':'`
 ///  - `flag`: (`'true'` | `'false'`)
 public struct PrecedenceGroupAssignmentSyntax: SyntaxProtocol, SyntaxHashable {
@@ -14992,9 +14992,9 @@ public struct PrecedenceGroupAssignmentSyntax: SyntaxProtocol, SyntaxHashable {
   
   public init(
       leadingTrivia: Trivia? = nil,
-      _ unexpectedBeforeAssignmentKeyword: UnexpectedNodesSyntax? = nil,
-      assignmentKeyword: TokenSyntax = .keyword(.assignment),
-      _ unexpectedBetweenAssignmentKeywordAndColon: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBeforeAssignmentLabel: UnexpectedNodesSyntax? = nil,
+      assignmentLabel: TokenSyntax = .keyword(.assignment),
+      _ unexpectedBetweenAssignmentLabelAndColon: UnexpectedNodesSyntax? = nil,
       colon: TokenSyntax = .colonToken(),
       _ unexpectedBetweenColonAndFlag: UnexpectedNodesSyntax? = nil,
       flag: TokenSyntax,
@@ -15005,18 +15005,18 @@ public struct PrecedenceGroupAssignmentSyntax: SyntaxProtocol, SyntaxHashable {
     // Extend the lifetime of all parameters so their arenas don't get destroyed
     // before they can be added as children of the new arena.
     let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (
-            unexpectedBeforeAssignmentKeyword, 
-            assignmentKeyword, 
-            unexpectedBetweenAssignmentKeywordAndColon, 
+            unexpectedBeforeAssignmentLabel, 
+            assignmentLabel, 
+            unexpectedBetweenAssignmentLabelAndColon, 
             colon, 
             unexpectedBetweenColonAndFlag, 
             flag, 
             unexpectedAfterFlag
           ))) { (arena, _) in
       let layout: [RawSyntax?] = [
-          unexpectedBeforeAssignmentKeyword?.raw, 
-          assignmentKeyword.raw, 
-          unexpectedBetweenAssignmentKeywordAndColon?.raw, 
+          unexpectedBeforeAssignmentLabel?.raw, 
+          assignmentLabel.raw, 
+          unexpectedBetweenAssignmentLabelAndColon?.raw, 
           colon.raw, 
           unexpectedBetweenColonAndFlag?.raw, 
           flag.raw, 
@@ -15035,7 +15035,7 @@ public struct PrecedenceGroupAssignmentSyntax: SyntaxProtocol, SyntaxHashable {
     self.init(data)
   }
   
-  public var unexpectedBeforeAssignmentKeyword: UnexpectedNodesSyntax? {
+  public var unexpectedBeforeAssignmentLabel: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 0, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -15044,7 +15044,7 @@ public struct PrecedenceGroupAssignmentSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var assignmentKeyword: TokenSyntax {
+  public var assignmentLabel: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 1, parent: Syntax(self))!)
     }
@@ -15053,7 +15053,7 @@ public struct PrecedenceGroupAssignmentSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenAssignmentKeywordAndColon: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenAssignmentLabelAndColon: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -15101,9 +15101,9 @@ public struct PrecedenceGroupAssignmentSyntax: SyntaxProtocol, SyntaxHashable {
   
   public static var structure: SyntaxNodeStructure {
     return .layout([
-          \Self.unexpectedBeforeAssignmentKeyword, 
-          \Self.assignmentKeyword, 
-          \Self.unexpectedBetweenAssignmentKeywordAndColon, 
+          \Self.unexpectedBeforeAssignmentLabel, 
+          \Self.assignmentLabel, 
+          \Self.unexpectedBetweenAssignmentLabelAndColon, 
           \Self.colon, 
           \Self.unexpectedBetweenColonAndFlag, 
           \Self.flag, 
@@ -15118,7 +15118,7 @@ public struct PrecedenceGroupAssignmentSyntax: SyntaxProtocol, SyntaxHashable {
 ///
 /// ### Children
 /// 
-///  - `associativityKeyword`: `'associativity'`
+///  - `associativityLabel`: `'associativity'`
 ///  - `colon`: `':'`
 ///  - `value`: (`'left'` | `'right'` | `'none'`)
 public struct PrecedenceGroupAssociativitySyntax: SyntaxProtocol, SyntaxHashable {
@@ -15141,9 +15141,9 @@ public struct PrecedenceGroupAssociativitySyntax: SyntaxProtocol, SyntaxHashable
   
   public init(
       leadingTrivia: Trivia? = nil,
-      _ unexpectedBeforeAssociativityKeyword: UnexpectedNodesSyntax? = nil,
-      associativityKeyword: TokenSyntax = .keyword(.associativity),
-      _ unexpectedBetweenAssociativityKeywordAndColon: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBeforeAssociativityLabel: UnexpectedNodesSyntax? = nil,
+      associativityLabel: TokenSyntax = .keyword(.associativity),
+      _ unexpectedBetweenAssociativityLabelAndColon: UnexpectedNodesSyntax? = nil,
       colon: TokenSyntax = .colonToken(),
       _ unexpectedBetweenColonAndValue: UnexpectedNodesSyntax? = nil,
       value: TokenSyntax,
@@ -15154,18 +15154,18 @@ public struct PrecedenceGroupAssociativitySyntax: SyntaxProtocol, SyntaxHashable
     // Extend the lifetime of all parameters so their arenas don't get destroyed
     // before they can be added as children of the new arena.
     let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (
-            unexpectedBeforeAssociativityKeyword, 
-            associativityKeyword, 
-            unexpectedBetweenAssociativityKeywordAndColon, 
+            unexpectedBeforeAssociativityLabel, 
+            associativityLabel, 
+            unexpectedBetweenAssociativityLabelAndColon, 
             colon, 
             unexpectedBetweenColonAndValue, 
             value, 
             unexpectedAfterValue
           ))) { (arena, _) in
       let layout: [RawSyntax?] = [
-          unexpectedBeforeAssociativityKeyword?.raw, 
-          associativityKeyword.raw, 
-          unexpectedBetweenAssociativityKeywordAndColon?.raw, 
+          unexpectedBeforeAssociativityLabel?.raw, 
+          associativityLabel.raw, 
+          unexpectedBetweenAssociativityLabelAndColon?.raw, 
           colon.raw, 
           unexpectedBetweenColonAndValue?.raw, 
           value.raw, 
@@ -15184,7 +15184,7 @@ public struct PrecedenceGroupAssociativitySyntax: SyntaxProtocol, SyntaxHashable
     self.init(data)
   }
   
-  public var unexpectedBeforeAssociativityKeyword: UnexpectedNodesSyntax? {
+  public var unexpectedBeforeAssociativityLabel: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 0, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -15193,7 +15193,7 @@ public struct PrecedenceGroupAssociativitySyntax: SyntaxProtocol, SyntaxHashable
     }
   }
   
-  public var associativityKeyword: TokenSyntax {
+  public var associativityLabel: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 1, parent: Syntax(self))!)
     }
@@ -15202,7 +15202,7 @@ public struct PrecedenceGroupAssociativitySyntax: SyntaxProtocol, SyntaxHashable
     }
   }
   
-  public var unexpectedBetweenAssociativityKeywordAndColon: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenAssociativityLabelAndColon: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -15250,9 +15250,9 @@ public struct PrecedenceGroupAssociativitySyntax: SyntaxProtocol, SyntaxHashable
   
   public static var structure: SyntaxNodeStructure {
     return .layout([
-          \Self.unexpectedBeforeAssociativityKeyword, 
-          \Self.associativityKeyword, 
-          \Self.unexpectedBetweenAssociativityKeywordAndColon, 
+          \Self.unexpectedBeforeAssociativityLabel, 
+          \Self.associativityLabel, 
+          \Self.unexpectedBetweenAssociativityLabelAndColon, 
           \Self.colon, 
           \Self.unexpectedBetweenColonAndValue, 
           \Self.value, 
@@ -15562,9 +15562,9 @@ public struct PrecedenceGroupRelationSyntax: SyntaxProtocol, SyntaxHashable {
 
 /// ### Children
 /// 
-///  - `leftAngleBracket`: `'<'`
+///  - `leftAngle`: `'<'`
 ///  - `primaryAssociatedTypeList`: ``PrimaryAssociatedTypeListSyntax``
-///  - `rightAngleBracket`: `'>'`
+///  - `rightAngle`: `'>'`
 public struct PrimaryAssociatedTypeClauseSyntax: SyntaxProtocol, SyntaxHashable {
   public let _syntaxNode: Syntax
   
@@ -15585,35 +15585,35 @@ public struct PrimaryAssociatedTypeClauseSyntax: SyntaxProtocol, SyntaxHashable
   
   public init(
       leadingTrivia: Trivia? = nil,
-      _ unexpectedBeforeLeftAngleBracket: UnexpectedNodesSyntax? = nil,
-      leftAngleBracket: TokenSyntax = .leftAngleToken(),
-      _ unexpectedBetweenLeftAngleBracketAndPrimaryAssociatedTypeList: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBeforeLeftAngle: UnexpectedNodesSyntax? = nil,
+      leftAngle: TokenSyntax = .leftAngleToken(),
+      _ unexpectedBetweenLeftAngleAndPrimaryAssociatedTypeList: UnexpectedNodesSyntax? = nil,
       primaryAssociatedTypeList: PrimaryAssociatedTypeListSyntax,
-      _ unexpectedBetweenPrimaryAssociatedTypeListAndRightAngleBracket: UnexpectedNodesSyntax? = nil,
-      rightAngleBracket: TokenSyntax = .rightAngleToken(),
-      _ unexpectedAfterRightAngleBracket: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBetweenPrimaryAssociatedTypeListAndRightAngle: UnexpectedNodesSyntax? = nil,
+      rightAngle: TokenSyntax = .rightAngleToken(),
+      _ unexpectedAfterRightAngle: UnexpectedNodesSyntax? = nil,
       trailingTrivia: Trivia? = nil
     
   ) {
     // Extend the lifetime of all parameters so their arenas don't get destroyed
     // before they can be added as children of the new arena.
     let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (
-            unexpectedBeforeLeftAngleBracket, 
-            leftAngleBracket, 
-            unexpectedBetweenLeftAngleBracketAndPrimaryAssociatedTypeList, 
+            unexpectedBeforeLeftAngle, 
+            leftAngle, 
+            unexpectedBetweenLeftAngleAndPrimaryAssociatedTypeList, 
             primaryAssociatedTypeList, 
-            unexpectedBetweenPrimaryAssociatedTypeListAndRightAngleBracket, 
-            rightAngleBracket, 
-            unexpectedAfterRightAngleBracket
+            unexpectedBetweenPrimaryAssociatedTypeListAndRightAngle, 
+            rightAngle, 
+            unexpectedAfterRightAngle
           ))) { (arena, _) in
       let layout: [RawSyntax?] = [
-          unexpectedBeforeLeftAngleBracket?.raw, 
-          leftAngleBracket.raw, 
-          unexpectedBetweenLeftAngleBracketAndPrimaryAssociatedTypeList?.raw, 
+          unexpectedBeforeLeftAngle?.raw, 
+          leftAngle.raw, 
+          unexpectedBetweenLeftAngleAndPrimaryAssociatedTypeList?.raw, 
           primaryAssociatedTypeList.raw, 
-          unexpectedBetweenPrimaryAssociatedTypeListAndRightAngleBracket?.raw, 
-          rightAngleBracket.raw, 
-          unexpectedAfterRightAngleBracket?.raw
+          unexpectedBetweenPrimaryAssociatedTypeListAndRightAngle?.raw, 
+          rightAngle.raw, 
+          unexpectedAfterRightAngle?.raw
         ]
       let raw = RawSyntax.makeLayout(
         kind: SyntaxKind.primaryAssociatedTypeClause,
@@ -15628,7 +15628,7 @@ public struct PrimaryAssociatedTypeClauseSyntax: SyntaxProtocol, SyntaxHashable
     self.init(data)
   }
   
-  public var unexpectedBeforeLeftAngleBracket: UnexpectedNodesSyntax? {
+  public var unexpectedBeforeLeftAngle: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 0, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -15637,7 +15637,7 @@ public struct PrimaryAssociatedTypeClauseSyntax: SyntaxProtocol, SyntaxHashable
     }
   }
   
-  public var leftAngleBracket: TokenSyntax {
+  public var leftAngle: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 1, parent: Syntax(self))!)
     }
@@ -15646,7 +15646,7 @@ public struct PrimaryAssociatedTypeClauseSyntax: SyntaxProtocol, SyntaxHashable
     }
   }
   
-  public var unexpectedBetweenLeftAngleBracketAndPrimaryAssociatedTypeList: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenLeftAngleAndPrimaryAssociatedTypeList: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -15688,7 +15688,7 @@ public struct PrimaryAssociatedTypeClauseSyntax: SyntaxProtocol, SyntaxHashable
     return PrimaryAssociatedTypeClauseSyntax(newData)
   }
   
-  public var unexpectedBetweenPrimaryAssociatedTypeListAndRightAngleBracket: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenPrimaryAssociatedTypeListAndRightAngle: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 4, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -15697,7 +15697,7 @@ public struct PrimaryAssociatedTypeClauseSyntax: SyntaxProtocol, SyntaxHashable
     }
   }
   
-  public var rightAngleBracket: TokenSyntax {
+  public var rightAngle: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 5, parent: Syntax(self))!)
     }
@@ -15706,7 +15706,7 @@ public struct PrimaryAssociatedTypeClauseSyntax: SyntaxProtocol, SyntaxHashable
     }
   }
   
-  public var unexpectedAfterRightAngleBracket: UnexpectedNodesSyntax? {
+  public var unexpectedAfterRightAngle: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 6, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -15717,13 +15717,13 @@ public struct PrimaryAssociatedTypeClauseSyntax: SyntaxProtocol, SyntaxHashable
   
   public static var structure: SyntaxNodeStructure {
     return .layout([
-          \Self.unexpectedBeforeLeftAngleBracket, 
-          \Self.leftAngleBracket, 
-          \Self.unexpectedBetweenLeftAngleBracketAndPrimaryAssociatedTypeList, 
+          \Self.unexpectedBeforeLeftAngle, 
+          \Self.leftAngle, 
+          \Self.unexpectedBetweenLeftAngleAndPrimaryAssociatedTypeList, 
           \Self.primaryAssociatedTypeList, 
-          \Self.unexpectedBetweenPrimaryAssociatedTypeListAndRightAngleBracket, 
-          \Self.rightAngleBracket, 
-          \Self.unexpectedAfterRightAngleBracket
+          \Self.unexpectedBetweenPrimaryAssociatedTypeListAndRightAngle, 
+          \Self.rightAngle, 
+          \Self.unexpectedAfterRightAngle
         ])
   }
 }
@@ -15856,7 +15856,7 @@ public struct PrimaryAssociatedTypeSyntax: SyntaxProtocol, SyntaxHashable {
 /// ### Children
 /// 
 ///  - `baseType`: ``TypeSyntax``?
-///  - `dot`: `'.'`?
+///  - `period`: `'.'`?
 ///  - `name`: (`<identifier>` | `'self'` | `'Self'` | `'init'` | `<binaryOperator>`)
 ///  - `arguments`: ``DeclNameArgumentsSyntax``?
 public struct QualifiedDeclNameSyntax: SyntaxProtocol, SyntaxHashable {
@@ -15881,9 +15881,9 @@ public struct QualifiedDeclNameSyntax: SyntaxProtocol, SyntaxHashable {
       leadingTrivia: Trivia? = nil,
       _ unexpectedBeforeBaseType: UnexpectedNodesSyntax? = nil,
       baseType: (some TypeSyntaxProtocol)? = TypeSyntax?.none,
-      _ unexpectedBetweenBaseTypeAndDot: UnexpectedNodesSyntax? = nil,
-      dot: TokenSyntax? = nil,
-      _ unexpectedBetweenDotAndName: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBetweenBaseTypeAndPeriod: UnexpectedNodesSyntax? = nil,
+      period: TokenSyntax? = nil,
+      _ unexpectedBetweenPeriodAndName: UnexpectedNodesSyntax? = nil,
       name: TokenSyntax,
       _ unexpectedBetweenNameAndArguments: UnexpectedNodesSyntax? = nil,
       arguments: DeclNameArgumentsSyntax? = nil,
@@ -15896,9 +15896,9 @@ public struct QualifiedDeclNameSyntax: SyntaxProtocol, SyntaxHashable {
     let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (
             unexpectedBeforeBaseType, 
             baseType, 
-            unexpectedBetweenBaseTypeAndDot, 
-            dot, 
-            unexpectedBetweenDotAndName, 
+            unexpectedBetweenBaseTypeAndPeriod, 
+            period, 
+            unexpectedBetweenPeriodAndName, 
             name, 
             unexpectedBetweenNameAndArguments, 
             arguments, 
@@ -15907,9 +15907,9 @@ public struct QualifiedDeclNameSyntax: SyntaxProtocol, SyntaxHashable {
       let layout: [RawSyntax?] = [
           unexpectedBeforeBaseType?.raw, 
           baseType?.raw, 
-          unexpectedBetweenBaseTypeAndDot?.raw, 
-          dot?.raw, 
-          unexpectedBetweenDotAndName?.raw, 
+          unexpectedBetweenBaseTypeAndPeriod?.raw, 
+          period?.raw, 
+          unexpectedBetweenPeriodAndName?.raw, 
           name.raw, 
           unexpectedBetweenNameAndArguments?.raw, 
           arguments?.raw, 
@@ -15947,7 +15947,7 @@ public struct QualifiedDeclNameSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenBaseTypeAndDot: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenBaseTypeAndPeriod: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -15956,7 +15956,7 @@ public struct QualifiedDeclNameSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var dot: TokenSyntax? {
+  public var period: TokenSyntax? {
     get {
       return data.child(at: 3, parent: Syntax(self)).map(TokenSyntax.init)
     }
@@ -15965,7 +15965,7 @@ public struct QualifiedDeclNameSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenDotAndName: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenPeriodAndName: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 4, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -16016,9 +16016,9 @@ public struct QualifiedDeclNameSyntax: SyntaxProtocol, SyntaxHashable {
     return .layout([
           \Self.unexpectedBeforeBaseType, 
           \Self.baseType, 
-          \Self.unexpectedBetweenBaseTypeAndDot, 
-          \Self.dot, 
-          \Self.unexpectedBetweenDotAndName, 
+          \Self.unexpectedBetweenBaseTypeAndPeriod, 
+          \Self.period, 
+          \Self.unexpectedBetweenPeriodAndName, 
           \Self.name, 
           \Self.unexpectedBetweenNameAndArguments, 
           \Self.arguments, 
@@ -16303,7 +16303,7 @@ public struct SameTypeRequirementSyntax: SyntaxProtocol, SyntaxHashable {
 /// ### Children
 /// 
 ///  - `statements`: ``CodeBlockItemListSyntax``
-///  - `eofToken`: `''`
+///  - `endOfFileToken`: `''`
 public struct SourceFileSyntax: SyntaxProtocol, SyntaxHashable {
   public let _syntaxNode: Syntax
   
@@ -16326,9 +16326,9 @@ public struct SourceFileSyntax: SyntaxProtocol, SyntaxHashable {
       leadingTrivia: Trivia? = nil,
       _ unexpectedBeforeStatements: UnexpectedNodesSyntax? = nil,
       statements: CodeBlockItemListSyntax,
-      _ unexpectedBetweenStatementsAndEOFToken: UnexpectedNodesSyntax? = nil,
-      eofToken: TokenSyntax = .eof(),
-      _ unexpectedAfterEOFToken: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBetweenStatementsAndEndOfFileToken: UnexpectedNodesSyntax? = nil,
+      endOfFileToken: TokenSyntax = .eof(),
+      _ unexpectedAfterEndOfFileToken: UnexpectedNodesSyntax? = nil,
       trailingTrivia: Trivia? = nil
     
   ) {
@@ -16337,16 +16337,16 @@ public struct SourceFileSyntax: SyntaxProtocol, SyntaxHashable {
     let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (
             unexpectedBeforeStatements, 
             statements, 
-            unexpectedBetweenStatementsAndEOFToken, 
-            eofToken, 
-            unexpectedAfterEOFToken
+            unexpectedBetweenStatementsAndEndOfFileToken, 
+            endOfFileToken, 
+            unexpectedAfterEndOfFileToken
           ))) { (arena, _) in
       let layout: [RawSyntax?] = [
           unexpectedBeforeStatements?.raw, 
           statements.raw, 
-          unexpectedBetweenStatementsAndEOFToken?.raw, 
-          eofToken.raw, 
-          unexpectedAfterEOFToken?.raw
+          unexpectedBetweenStatementsAndEndOfFileToken?.raw, 
+          endOfFileToken.raw, 
+          unexpectedAfterEndOfFileToken?.raw
         ]
       let raw = RawSyntax.makeLayout(
         kind: SyntaxKind.sourceFile,
@@ -16403,7 +16403,7 @@ public struct SourceFileSyntax: SyntaxProtocol, SyntaxHashable {
     return SourceFileSyntax(newData)
   }
   
-  public var unexpectedBetweenStatementsAndEOFToken: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenStatementsAndEndOfFileToken: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -16412,7 +16412,7 @@ public struct SourceFileSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var eofToken: TokenSyntax {
+  public var endOfFileToken: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 3, parent: Syntax(self))!)
     }
@@ -16421,7 +16421,7 @@ public struct SourceFileSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedAfterEOFToken: UnexpectedNodesSyntax? {
+  public var unexpectedAfterEndOfFileToken: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 4, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -16434,9 +16434,9 @@ public struct SourceFileSyntax: SyntaxProtocol, SyntaxHashable {
     return .layout([
           \Self.unexpectedBeforeStatements, 
           \Self.statements, 
-          \Self.unexpectedBetweenStatementsAndEOFToken, 
-          \Self.eofToken, 
-          \Self.unexpectedAfterEOFToken
+          \Self.unexpectedBetweenStatementsAndEndOfFileToken, 
+          \Self.endOfFileToken, 
+          \Self.unexpectedAfterEndOfFileToken
         ])
   }
 }
@@ -17036,7 +17036,7 @@ public struct SwitchDefaultLabelSyntax: SyntaxProtocol, SyntaxHashable {
 ///
 /// ### Children
 /// 
-///  - `label`: `'target'`
+///  - `targetLabel`: `'target'`
 ///  - `colon`: `':'`
 ///  - `declname`: ``DeclNameSyntax``
 ///  - `trailingComma`: `','`?
@@ -17060,9 +17060,9 @@ public struct TargetFunctionEntrySyntax: SyntaxProtocol, SyntaxHashable {
   
   public init(
       leadingTrivia: Trivia? = nil,
-      _ unexpectedBeforeLabel: UnexpectedNodesSyntax? = nil,
-      label: TokenSyntax = .keyword(.target),
-      _ unexpectedBetweenLabelAndColon: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBeforeTargetLabel: UnexpectedNodesSyntax? = nil,
+      targetLabel: TokenSyntax = .keyword(.target),
+      _ unexpectedBetweenTargetLabelAndColon: UnexpectedNodesSyntax? = nil,
       colon: TokenSyntax = .colonToken(),
       _ unexpectedBetweenColonAndDeclname: UnexpectedNodesSyntax? = nil,
       declname: DeclNameSyntax,
@@ -17075,9 +17075,9 @@ public struct TargetFunctionEntrySyntax: SyntaxProtocol, SyntaxHashable {
     // Extend the lifetime of all parameters so their arenas don't get destroyed
     // before they can be added as children of the new arena.
     let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (
-            unexpectedBeforeLabel, 
-            label, 
-            unexpectedBetweenLabelAndColon, 
+            unexpectedBeforeTargetLabel, 
+            targetLabel, 
+            unexpectedBetweenTargetLabelAndColon, 
             colon, 
             unexpectedBetweenColonAndDeclname, 
             declname, 
@@ -17086,9 +17086,9 @@ public struct TargetFunctionEntrySyntax: SyntaxProtocol, SyntaxHashable {
             unexpectedAfterTrailingComma
           ))) { (arena, _) in
       let layout: [RawSyntax?] = [
-          unexpectedBeforeLabel?.raw, 
-          label.raw, 
-          unexpectedBetweenLabelAndColon?.raw, 
+          unexpectedBeforeTargetLabel?.raw, 
+          targetLabel.raw, 
+          unexpectedBetweenTargetLabelAndColon?.raw, 
           colon.raw, 
           unexpectedBetweenColonAndDeclname?.raw, 
           declname.raw, 
@@ -17109,7 +17109,7 @@ public struct TargetFunctionEntrySyntax: SyntaxProtocol, SyntaxHashable {
     self.init(data)
   }
   
-  public var unexpectedBeforeLabel: UnexpectedNodesSyntax? {
+  public var unexpectedBeforeTargetLabel: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 0, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -17119,7 +17119,7 @@ public struct TargetFunctionEntrySyntax: SyntaxProtocol, SyntaxHashable {
   }
   
   /// The label of the argument
-  public var label: TokenSyntax {
+  public var targetLabel: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 1, parent: Syntax(self))!)
     }
@@ -17128,7 +17128,7 @@ public struct TargetFunctionEntrySyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenLabelAndColon: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenTargetLabelAndColon: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -17196,9 +17196,9 @@ public struct TargetFunctionEntrySyntax: SyntaxProtocol, SyntaxHashable {
   
   public static var structure: SyntaxNodeStructure {
     return .layout([
-          \Self.unexpectedBeforeLabel, 
-          \Self.label, 
-          \Self.unexpectedBetweenLabelAndColon, 
+          \Self.unexpectedBeforeTargetLabel, 
+          \Self.targetLabel, 
+          \Self.unexpectedBetweenTargetLabelAndColon, 
           \Self.colon, 
           \Self.unexpectedBetweenColonAndDeclname, 
           \Self.declname, 
@@ -17390,8 +17390,8 @@ public struct TupleExprElementSyntax: SyntaxProtocol, SyntaxHashable {
 
 /// ### Children
 /// 
-///  - `labelName`: `<identifier>`?
-///  - `labelColon`: `':'`?
+///  - `label`: `<identifier>`?
+///  - `colon`: `':'`?
 ///  - `pattern`: ``PatternSyntax``
 ///  - `trailingComma`: `','`?
 public struct TuplePatternElementSyntax: SyntaxProtocol, SyntaxHashable {
@@ -17414,11 +17414,11 @@ public struct TuplePatternElementSyntax: SyntaxProtocol, SyntaxHashable {
   
   public init(
       leadingTrivia: Trivia? = nil,
-      _ unexpectedBeforeLabelName: UnexpectedNodesSyntax? = nil,
-      labelName: TokenSyntax? = nil,
-      _ unexpectedBetweenLabelNameAndLabelColon: UnexpectedNodesSyntax? = nil,
-      labelColon: TokenSyntax? = nil,
-      _ unexpectedBetweenLabelColonAndPattern: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBeforeLabel: UnexpectedNodesSyntax? = nil,
+      label: TokenSyntax? = nil,
+      _ unexpectedBetweenLabelAndColon: UnexpectedNodesSyntax? = nil,
+      colon: TokenSyntax? = nil,
+      _ unexpectedBetweenColonAndPattern: UnexpectedNodesSyntax? = nil,
       pattern: some PatternSyntaxProtocol,
       _ unexpectedBetweenPatternAndTrailingComma: UnexpectedNodesSyntax? = nil,
       trailingComma: TokenSyntax? = nil,
@@ -17429,22 +17429,22 @@ public struct TuplePatternElementSyntax: SyntaxProtocol, SyntaxHashable {
     // Extend the lifetime of all parameters so their arenas don't get destroyed
     // before they can be added as children of the new arena.
     let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (
-            unexpectedBeforeLabelName, 
-            labelName, 
-            unexpectedBetweenLabelNameAndLabelColon, 
-            labelColon, 
-            unexpectedBetweenLabelColonAndPattern, 
+            unexpectedBeforeLabel, 
+            label, 
+            unexpectedBetweenLabelAndColon, 
+            colon, 
+            unexpectedBetweenColonAndPattern, 
             pattern, 
             unexpectedBetweenPatternAndTrailingComma, 
             trailingComma, 
             unexpectedAfterTrailingComma
           ))) { (arena, _) in
       let layout: [RawSyntax?] = [
-          unexpectedBeforeLabelName?.raw, 
-          labelName?.raw, 
-          unexpectedBetweenLabelNameAndLabelColon?.raw, 
-          labelColon?.raw, 
-          unexpectedBetweenLabelColonAndPattern?.raw, 
+          unexpectedBeforeLabel?.raw, 
+          label?.raw, 
+          unexpectedBetweenLabelAndColon?.raw, 
+          colon?.raw, 
+          unexpectedBetweenColonAndPattern?.raw, 
           pattern.raw, 
           unexpectedBetweenPatternAndTrailingComma?.raw, 
           trailingComma?.raw, 
@@ -17463,7 +17463,7 @@ public struct TuplePatternElementSyntax: SyntaxProtocol, SyntaxHashable {
     self.init(data)
   }
   
-  public var unexpectedBeforeLabelName: UnexpectedNodesSyntax? {
+  public var unexpectedBeforeLabel: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 0, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -17472,7 +17472,7 @@ public struct TuplePatternElementSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var labelName: TokenSyntax? {
+  public var label: TokenSyntax? {
     get {
       return data.child(at: 1, parent: Syntax(self)).map(TokenSyntax.init)
     }
@@ -17481,7 +17481,7 @@ public struct TuplePatternElementSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenLabelNameAndLabelColon: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenLabelAndColon: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -17490,7 +17490,7 @@ public struct TuplePatternElementSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var labelColon: TokenSyntax? {
+  public var colon: TokenSyntax? {
     get {
       return data.child(at: 3, parent: Syntax(self)).map(TokenSyntax.init)
     }
@@ -17499,7 +17499,7 @@ public struct TuplePatternElementSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenLabelColonAndPattern: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenColonAndPattern: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 4, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -17546,11 +17546,11 @@ public struct TuplePatternElementSyntax: SyntaxProtocol, SyntaxHashable {
   
   public static var structure: SyntaxNodeStructure {
     return .layout([
-          \Self.unexpectedBeforeLabelName, 
-          \Self.labelName, 
-          \Self.unexpectedBetweenLabelNameAndLabelColon, 
-          \Self.labelColon, 
-          \Self.unexpectedBetweenLabelColonAndPattern, 
+          \Self.unexpectedBeforeLabel, 
+          \Self.label, 
+          \Self.unexpectedBetweenLabelAndColon, 
+          \Self.colon, 
+          \Self.unexpectedBetweenColonAndPattern, 
           \Self.pattern, 
           \Self.unexpectedBetweenPatternAndTrailingComma, 
           \Self.trailingComma, 
@@ -17565,7 +17565,7 @@ public struct TuplePatternElementSyntax: SyntaxProtocol, SyntaxHashable {
 
 /// ### Children
 /// 
-///  - `inOut`: `'inout'`?
+///  - `inoutKeyword`: `'inout'`?
 ///  - `name`: (`<identifier>` | `'_'`)?
 ///  - `secondName`: (`<identifier>` | `'_'`)?
 ///  - `colon`: `':'`?
@@ -17593,9 +17593,9 @@ public struct TupleTypeElementSyntax: SyntaxProtocol, SyntaxHashable {
   
   public init(
       leadingTrivia: Trivia? = nil,
-      _ unexpectedBeforeInOut: UnexpectedNodesSyntax? = nil,
-      inOut: TokenSyntax? = nil,
-      _ unexpectedBetweenInOutAndName: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBeforeInoutKeyword: UnexpectedNodesSyntax? = nil,
+      inoutKeyword: TokenSyntax? = nil,
+      _ unexpectedBetweenInoutKeywordAndName: UnexpectedNodesSyntax? = nil,
       name: TokenSyntax? = nil,
       _ unexpectedBetweenNameAndSecondName: UnexpectedNodesSyntax? = nil,
       secondName: TokenSyntax? = nil,
@@ -17616,9 +17616,9 @@ public struct TupleTypeElementSyntax: SyntaxProtocol, SyntaxHashable {
     // Extend the lifetime of all parameters so their arenas don't get destroyed
     // before they can be added as children of the new arena.
     let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (
-            unexpectedBeforeInOut, 
-            inOut, 
-            unexpectedBetweenInOutAndName, 
+            unexpectedBeforeInoutKeyword, 
+            inoutKeyword, 
+            unexpectedBetweenInoutKeywordAndName, 
             name, 
             unexpectedBetweenNameAndSecondName, 
             secondName, 
@@ -17635,9 +17635,9 @@ public struct TupleTypeElementSyntax: SyntaxProtocol, SyntaxHashable {
             unexpectedAfterTrailingComma
           ))) { (arena, _) in
       let layout: [RawSyntax?] = [
-          unexpectedBeforeInOut?.raw, 
-          inOut?.raw, 
-          unexpectedBetweenInOutAndName?.raw, 
+          unexpectedBeforeInoutKeyword?.raw, 
+          inoutKeyword?.raw, 
+          unexpectedBetweenInoutKeywordAndName?.raw, 
           name?.raw, 
           unexpectedBetweenNameAndSecondName?.raw, 
           secondName?.raw, 
@@ -17666,7 +17666,7 @@ public struct TupleTypeElementSyntax: SyntaxProtocol, SyntaxHashable {
     self.init(data)
   }
   
-  public var unexpectedBeforeInOut: UnexpectedNodesSyntax? {
+  public var unexpectedBeforeInoutKeyword: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 0, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -17675,7 +17675,7 @@ public struct TupleTypeElementSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var inOut: TokenSyntax? {
+  public var inoutKeyword: TokenSyntax? {
     get {
       return data.child(at: 1, parent: Syntax(self)).map(TokenSyntax.init)
     }
@@ -17684,7 +17684,7 @@ public struct TupleTypeElementSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenInOutAndName: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenInoutKeywordAndName: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -17821,9 +17821,9 @@ public struct TupleTypeElementSyntax: SyntaxProtocol, SyntaxHashable {
   
   public static var structure: SyntaxNodeStructure {
     return .layout([
-          \Self.unexpectedBeforeInOut, 
-          \Self.inOut, 
-          \Self.unexpectedBetweenInOutAndName, 
+          \Self.unexpectedBeforeInoutKeyword, 
+          \Self.inoutKeyword, 
+          \Self.unexpectedBetweenInoutKeywordAndName, 
           \Self.name, 
           \Self.unexpectedBetweenNameAndSecondName, 
           \Self.secondName, 
diff --git a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxStmtNodes.swift b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxStmtNodes.swift
index 44e7410fa3b..ee96f3301bd 100644
--- a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxStmtNodes.swift
+++ b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxStmtNodes.swift
@@ -1374,8 +1374,8 @@ public struct GuardStmtSyntax: StmtSyntaxProtocol, SyntaxHashable {
 
 /// ### Children
 /// 
-///  - `labelName`: `<identifier>`
-///  - `labelColon`: `':'`
+///  - `label`: `<identifier>`
+///  - `colon`: `':'`
 ///  - `statement`: ``StmtSyntax``
 public struct LabeledStmtSyntax: StmtSyntaxProtocol, SyntaxHashable {
   public let _syntaxNode: Syntax
@@ -1397,11 +1397,11 @@ public struct LabeledStmtSyntax: StmtSyntaxProtocol, SyntaxHashable {
   
   public init(
       leadingTrivia: Trivia? = nil,
-      _ unexpectedBeforeLabelName: UnexpectedNodesSyntax? = nil,
-      labelName: TokenSyntax,
-      _ unexpectedBetweenLabelNameAndLabelColon: UnexpectedNodesSyntax? = nil,
-      labelColon: TokenSyntax = .colonToken(),
-      _ unexpectedBetweenLabelColonAndStatement: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBeforeLabel: UnexpectedNodesSyntax? = nil,
+      label: TokenSyntax,
+      _ unexpectedBetweenLabelAndColon: UnexpectedNodesSyntax? = nil,
+      colon: TokenSyntax = .colonToken(),
+      _ unexpectedBetweenColonAndStatement: UnexpectedNodesSyntax? = nil,
       statement: some StmtSyntaxProtocol,
       _ unexpectedAfterStatement: UnexpectedNodesSyntax? = nil,
       trailingTrivia: Trivia? = nil
@@ -1410,20 +1410,20 @@ public struct LabeledStmtSyntax: StmtSyntaxProtocol, SyntaxHashable {
     // Extend the lifetime of all parameters so their arenas don't get destroyed
     // before they can be added as children of the new arena.
     let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (
-            unexpectedBeforeLabelName, 
-            labelName, 
-            unexpectedBetweenLabelNameAndLabelColon, 
-            labelColon, 
-            unexpectedBetweenLabelColonAndStatement, 
+            unexpectedBeforeLabel, 
+            label, 
+            unexpectedBetweenLabelAndColon, 
+            colon, 
+            unexpectedBetweenColonAndStatement, 
             statement, 
             unexpectedAfterStatement
           ))) { (arena, _) in
       let layout: [RawSyntax?] = [
-          unexpectedBeforeLabelName?.raw, 
-          labelName.raw, 
-          unexpectedBetweenLabelNameAndLabelColon?.raw, 
-          labelColon.raw, 
-          unexpectedBetweenLabelColonAndStatement?.raw, 
+          unexpectedBeforeLabel?.raw, 
+          label.raw, 
+          unexpectedBetweenLabelAndColon?.raw, 
+          colon.raw, 
+          unexpectedBetweenColonAndStatement?.raw, 
           statement.raw, 
           unexpectedAfterStatement?.raw
         ]
@@ -1440,7 +1440,7 @@ public struct LabeledStmtSyntax: StmtSyntaxProtocol, SyntaxHashable {
     self.init(data)
   }
   
-  public var unexpectedBeforeLabelName: UnexpectedNodesSyntax? {
+  public var unexpectedBeforeLabel: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 0, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -1449,7 +1449,7 @@ public struct LabeledStmtSyntax: StmtSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var labelName: TokenSyntax {
+  public var label: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 1, parent: Syntax(self))!)
     }
@@ -1458,7 +1458,7 @@ public struct LabeledStmtSyntax: StmtSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenLabelNameAndLabelColon: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenLabelAndColon: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -1467,7 +1467,7 @@ public struct LabeledStmtSyntax: StmtSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var labelColon: TokenSyntax {
+  public var colon: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 3, parent: Syntax(self))!)
     }
@@ -1476,7 +1476,7 @@ public struct LabeledStmtSyntax: StmtSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenLabelColonAndStatement: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenColonAndStatement: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 4, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -1505,11 +1505,11 @@ public struct LabeledStmtSyntax: StmtSyntaxProtocol, SyntaxHashable {
   
   public static var structure: SyntaxNodeStructure {
     return .layout([
-          \Self.unexpectedBeforeLabelName, 
-          \Self.labelName, 
-          \Self.unexpectedBetweenLabelNameAndLabelColon, 
-          \Self.labelColon, 
-          \Self.unexpectedBetweenLabelColonAndStatement, 
+          \Self.unexpectedBeforeLabel, 
+          \Self.label, 
+          \Self.unexpectedBetweenLabelAndColon, 
+          \Self.colon, 
+          \Self.unexpectedBetweenColonAndStatement, 
           \Self.statement, 
           \Self.unexpectedAfterStatement
         ])
diff --git a/Sources/SwiftSyntaxBuilder/ConvenienceInitializers.swift b/Sources/SwiftSyntaxBuilder/ConvenienceInitializers.swift
index 10d8b301c90..aeb6dfd3090 100644
--- a/Sources/SwiftSyntaxBuilder/ConvenienceInitializers.swift
+++ b/Sources/SwiftSyntaxBuilder/ConvenienceInitializers.swift
@@ -62,7 +62,7 @@ extension AttributeSyntax {
 
 extension BinaryOperatorExprSyntax {
   public init(text: String) {
-    self.init(operatorToken: .binaryOperator(text))
+    self.init(operator: .binaryOperator(text))
   }
 }
 
@@ -155,7 +155,7 @@ extension ExprSyntax {
 
 extension FloatLiteralExprSyntax: ExpressibleByFloatLiteral {
   public init(_ value: Float) {
-    self.init(floatingDigits: .floatingLiteral(String(value)))
+    self.init(digits: .floatingLiteral(String(value)))
   }
 
   public init(floatLiteral value: Float) {
diff --git a/Sources/SwiftSyntaxBuilder/Syntax+StringInterpolation.swift b/Sources/SwiftSyntaxBuilder/Syntax+StringInterpolation.swift
index 79b4ed26172..2cf4048328e 100644
--- a/Sources/SwiftSyntaxBuilder/Syntax+StringInterpolation.swift
+++ b/Sources/SwiftSyntaxBuilder/Syntax+StringInterpolation.swift
@@ -265,7 +265,7 @@ extension ExpressibleByLiteralSyntax where Self: FloatingPoint, Self: LosslessSt
     case .negativeInfinity, .negativeZero:
       return ExprSyntax(
         PrefixOperatorExprSyntax(
-          operatorToken: .prefixOperator("-"),
+          operator: .prefixOperator("-"),
           postfixExpression: (-self).makeLiteralSyntax()
         )
       )
@@ -273,7 +273,7 @@ extension ExpressibleByLiteralSyntax where Self: FloatingPoint, Self: LosslessSt
     case .negativeNormal, .negativeSubnormal, .positiveZero, .positiveSubnormal, .positiveNormal:
       // TODO: Thousands separators?
       let digits = String(self)
-      return ExprSyntax(FloatLiteralExprSyntax(floatingDigits: .floatingLiteral(digits)))
+      return ExprSyntax(FloatLiteralExprSyntax(digits: .floatingLiteral(digits)))
     }
 
   }
diff --git a/Sources/SwiftSyntaxBuilder/ValidatingSyntaxNodes.swift b/Sources/SwiftSyntaxBuilder/ValidatingSyntaxNodes.swift
index 13cb7f80e16..3e65aa99fb5 100644
--- a/Sources/SwiftSyntaxBuilder/ValidatingSyntaxNodes.swift
+++ b/Sources/SwiftSyntaxBuilder/ValidatingSyntaxNodes.swift
@@ -38,7 +38,7 @@ extension Trivia {
     self = trivia
     if pieces.contains(where: { $0.isUnexpected }) {
       var diagnostics: [Diagnostic] = []
-      let tree = SourceFileSyntax(statements: [], eofToken: .eof(leadingTrivia: self))
+      let tree = SourceFileSyntax(statements: [], endOfFileToken: .eof(leadingTrivia: self))
       var offset = 0
       for piece in pieces {
         if case .unexpectedText(let contents) = piece {
diff --git a/Sources/SwiftSyntaxBuilder/generated/BuildableNodes.swift b/Sources/SwiftSyntaxBuilder/generated/BuildableNodes.swift
index 828b6ca9b13..5b79384e8be 100644
--- a/Sources/SwiftSyntaxBuilder/generated/BuildableNodes.swift
+++ b/Sources/SwiftSyntaxBuilder/generated/BuildableNodes.swift
@@ -494,9 +494,9 @@ extension ExpressionSegmentSyntax {
       leadingTrivia: Trivia? = nil, 
       unexpectedBeforeBackslash: UnexpectedNodesSyntax? = nil, 
       backslash: TokenSyntax = .backslashToken(), 
-      unexpectedBetweenBackslashAndDelimiter: UnexpectedNodesSyntax? = nil, 
-      delimiter: TokenSyntax? = nil, 
-      unexpectedBetweenDelimiterAndLeftParen: UnexpectedNodesSyntax? = nil, 
+      unexpectedBetweenBackslashAndRawStringDelimiter: UnexpectedNodesSyntax? = nil, 
+      rawStringDelimiter: TokenSyntax? = nil, 
+      unexpectedBetweenRawStringDelimiterAndLeftParen: UnexpectedNodesSyntax? = nil, 
       leftParen: TokenSyntax = .leftParenToken(), 
       unexpectedBetweenLeftParenAndExpressions: UnexpectedNodesSyntax? = nil, 
       unexpectedBetweenExpressionsAndRightParen: UnexpectedNodesSyntax? = nil, 
@@ -509,9 +509,9 @@ extension ExpressionSegmentSyntax {
         leadingTrivia: leadingTrivia, 
         unexpectedBeforeBackslash, 
         backslash: backslash, 
-        unexpectedBetweenBackslashAndDelimiter, 
-        delimiter: delimiter, 
-        unexpectedBetweenDelimiterAndLeftParen, 
+        unexpectedBetweenBackslashAndRawStringDelimiter, 
+        rawStringDelimiter: rawStringDelimiter, 
+        unexpectedBetweenRawStringDelimiterAndLeftParen, 
         leftParen: leftParen, 
         unexpectedBetweenLeftParenAndExpressions, 
         expressions: expressionsBuilder(), 
@@ -713,24 +713,24 @@ extension GenericArgumentClauseSyntax {
   /// A convenience initializer that allows initializing syntax collections using result builders
   public init(
       leadingTrivia: Trivia? = nil, 
-      unexpectedBeforeLeftAngleBracket: UnexpectedNodesSyntax? = nil, 
-      leftAngleBracket: TokenSyntax = .leftAngleToken(), 
-      unexpectedBetweenLeftAngleBracketAndArguments: UnexpectedNodesSyntax? = nil, 
-      unexpectedBetweenArgumentsAndRightAngleBracket: UnexpectedNodesSyntax? = nil, 
-      rightAngleBracket: TokenSyntax = .rightAngleToken(), 
-      unexpectedAfterRightAngleBracket: UnexpectedNodesSyntax? = nil, 
+      unexpectedBeforeLeftAngle: UnexpectedNodesSyntax? = nil, 
+      leftAngle: TokenSyntax = .leftAngleToken(), 
+      unexpectedBetweenLeftAngleAndArguments: UnexpectedNodesSyntax? = nil, 
+      unexpectedBetweenArgumentsAndRightAngle: UnexpectedNodesSyntax? = nil, 
+      rightAngle: TokenSyntax = .rightAngleToken(), 
+      unexpectedAfterRightAngle: UnexpectedNodesSyntax? = nil, 
       @GenericArgumentListBuilder argumentsBuilder: () throws -> GenericArgumentListSyntax, 
       trailingTrivia: Trivia? = nil
     ) rethrows {
     try self.init(
         leadingTrivia: leadingTrivia, 
-        unexpectedBeforeLeftAngleBracket, 
-        leftAngleBracket: leftAngleBracket, 
-        unexpectedBetweenLeftAngleBracketAndArguments, 
+        unexpectedBeforeLeftAngle, 
+        leftAngle: leftAngle, 
+        unexpectedBetweenLeftAngleAndArguments, 
         arguments: argumentsBuilder(), 
-        unexpectedBetweenArgumentsAndRightAngleBracket, 
-        rightAngleBracket: rightAngleBracket, 
-        unexpectedAfterRightAngleBracket, 
+        unexpectedBetweenArgumentsAndRightAngle, 
+        rightAngle: rightAngle, 
+        unexpectedAfterRightAngle, 
         trailingTrivia: trailingTrivia
       )
   }
@@ -740,28 +740,28 @@ extension GenericParameterClauseSyntax {
   /// A convenience initializer that allows initializing syntax collections using result builders
   public init(
       leadingTrivia: Trivia? = nil, 
-      unexpectedBeforeLeftAngleBracket: UnexpectedNodesSyntax? = nil, 
-      leftAngleBracket: TokenSyntax = .leftAngleToken(), 
-      unexpectedBetweenLeftAngleBracketAndParameters: UnexpectedNodesSyntax? = nil, 
+      unexpectedBeforeLeftAngle: UnexpectedNodesSyntax? = nil, 
+      leftAngle: TokenSyntax = .leftAngleToken(), 
+      unexpectedBetweenLeftAngleAndParameters: UnexpectedNodesSyntax? = nil, 
       unexpectedBetweenParametersAndGenericWhereClause: UnexpectedNodesSyntax? = nil, 
       genericWhereClause: GenericWhereClauseSyntax? = nil, 
-      unexpectedBetweenGenericWhereClauseAndRightAngleBracket: UnexpectedNodesSyntax? = nil, 
-      rightAngleBracket: TokenSyntax = .rightAngleToken(), 
-      unexpectedAfterRightAngleBracket: UnexpectedNodesSyntax? = nil, 
+      unexpectedBetweenGenericWhereClauseAndRightAngle: UnexpectedNodesSyntax? = nil, 
+      rightAngle: TokenSyntax = .rightAngleToken(), 
+      unexpectedAfterRightAngle: UnexpectedNodesSyntax? = nil, 
       @GenericParameterListBuilder parametersBuilder: () throws -> GenericParameterListSyntax, 
       trailingTrivia: Trivia? = nil
     ) rethrows {
     try self.init(
         leadingTrivia: leadingTrivia, 
-        unexpectedBeforeLeftAngleBracket, 
-        leftAngleBracket: leftAngleBracket, 
-        unexpectedBetweenLeftAngleBracketAndParameters, 
+        unexpectedBeforeLeftAngle, 
+        leftAngle: leftAngle, 
+        unexpectedBetweenLeftAngleAndParameters, 
         parameters: parametersBuilder(), 
         unexpectedBetweenParametersAndGenericWhereClause, 
         genericWhereClause: genericWhereClause, 
-        unexpectedBetweenGenericWhereClauseAndRightAngleBracket, 
-        rightAngleBracket: rightAngleBracket, 
-        unexpectedAfterRightAngleBracket, 
+        unexpectedBetweenGenericWhereClauseAndRightAngle, 
+        rightAngle: rightAngle, 
+        unexpectedAfterRightAngle, 
         trailingTrivia: trailingTrivia
       )
   }
@@ -940,24 +940,24 @@ extension KeyPathSubscriptComponentSyntax {
   /// A convenience initializer that allows initializing syntax collections using result builders
   public init(
       leadingTrivia: Trivia? = nil, 
-      unexpectedBeforeLeftBracket: UnexpectedNodesSyntax? = nil, 
-      leftBracket: TokenSyntax = .leftSquareToken(), 
-      unexpectedBetweenLeftBracketAndArgumentList: UnexpectedNodesSyntax? = nil, 
-      unexpectedBetweenArgumentListAndRightBracket: UnexpectedNodesSyntax? = nil, 
-      rightBracket: TokenSyntax = .rightSquareToken(), 
-      unexpectedAfterRightBracket: UnexpectedNodesSyntax? = nil, 
+      unexpectedBeforeLeftSquare: UnexpectedNodesSyntax? = nil, 
+      leftSquare: TokenSyntax = .leftSquareToken(), 
+      unexpectedBetweenLeftSquareAndArgumentList: UnexpectedNodesSyntax? = nil, 
+      unexpectedBetweenArgumentListAndRightSquare: UnexpectedNodesSyntax? = nil, 
+      rightSquare: TokenSyntax = .rightSquareToken(), 
+      unexpectedAfterRightSquare: UnexpectedNodesSyntax? = nil, 
       @TupleExprElementListBuilder argumentListBuilder: () throws -> TupleExprElementListSyntax, 
       trailingTrivia: Trivia? = nil
     ) rethrows {
     try self.init(
         leadingTrivia: leadingTrivia, 
-        unexpectedBeforeLeftBracket, 
-        leftBracket: leftBracket, 
-        unexpectedBetweenLeftBracketAndArgumentList, 
+        unexpectedBeforeLeftSquare, 
+        leftSquare: leftSquare, 
+        unexpectedBetweenLeftSquareAndArgumentList, 
         argumentList: argumentListBuilder(), 
-        unexpectedBetweenArgumentListAndRightBracket, 
-        rightBracket: rightBracket, 
-        unexpectedAfterRightBracket, 
+        unexpectedBetweenArgumentListAndRightSquare, 
+        rightSquare: rightSquare, 
+        unexpectedAfterRightSquare, 
         trailingTrivia: trailingTrivia
       )
   }
@@ -971,9 +971,9 @@ extension MacroExpansionDeclSyntax {
       attributes: AttributeListSyntax? = nil, 
       unexpectedBetweenAttributesAndModifiers: UnexpectedNodesSyntax? = nil, 
       modifiers: ModifierListSyntax? = nil, 
-      unexpectedBetweenModifiersAndPoundToken: UnexpectedNodesSyntax? = nil, 
-      poundToken: TokenSyntax = .poundToken(), 
-      unexpectedBetweenPoundTokenAndMacro: UnexpectedNodesSyntax? = nil, 
+      unexpectedBetweenModifiersAndPound: UnexpectedNodesSyntax? = nil, 
+      pound: TokenSyntax = .poundToken(), 
+      unexpectedBetweenPoundAndMacro: UnexpectedNodesSyntax? = nil, 
       macro: TokenSyntax, 
       unexpectedBetweenMacroAndGenericArguments: UnexpectedNodesSyntax? = nil, 
       genericArguments: GenericArgumentClauseSyntax? = nil, 
@@ -996,9 +996,9 @@ extension MacroExpansionDeclSyntax {
         attributes: attributes, 
         unexpectedBetweenAttributesAndModifiers, 
         modifiers: modifiers, 
-        unexpectedBetweenModifiersAndPoundToken, 
-        poundToken: poundToken, 
-        unexpectedBetweenPoundTokenAndMacro, 
+        unexpectedBetweenModifiersAndPound, 
+        pound: pound, 
+        unexpectedBetweenPoundAndMacro, 
         macro: macro, 
         unexpectedBetweenMacroAndGenericArguments, 
         genericArguments: genericArguments, 
@@ -1022,9 +1022,9 @@ extension MacroExpansionExprSyntax {
   /// A convenience initializer that allows initializing syntax collections using result builders
   public init(
       leadingTrivia: Trivia? = nil, 
-      unexpectedBeforePoundToken: UnexpectedNodesSyntax? = nil, 
-      poundToken: TokenSyntax = .poundToken(), 
-      unexpectedBetweenPoundTokenAndMacro: UnexpectedNodesSyntax? = nil, 
+      unexpectedBeforePound: UnexpectedNodesSyntax? = nil, 
+      pound: TokenSyntax = .poundToken(), 
+      unexpectedBetweenPoundAndMacro: UnexpectedNodesSyntax? = nil, 
       macro: TokenSyntax, 
       unexpectedBetweenMacroAndGenericArguments: UnexpectedNodesSyntax? = nil, 
       genericArguments: GenericArgumentClauseSyntax? = nil, 
@@ -1043,9 +1043,9 @@ extension MacroExpansionExprSyntax {
     ) rethrows {
     try self.init(
         leadingTrivia: leadingTrivia, 
-        unexpectedBeforePoundToken, 
-        poundToken: poundToken, 
-        unexpectedBetweenPoundTokenAndMacro, 
+        unexpectedBeforePound, 
+        pound: pound, 
+        unexpectedBetweenPoundAndMacro, 
         macro: macro, 
         unexpectedBetweenMacroAndGenericArguments, 
         genericArguments: genericArguments, 
@@ -1221,9 +1221,9 @@ extension SourceFileSyntax {
   public init(
       leadingTrivia: Trivia? = nil, 
       unexpectedBeforeStatements: UnexpectedNodesSyntax? = nil, 
-      unexpectedBetweenStatementsAndEOFToken: UnexpectedNodesSyntax? = nil, 
-      eofToken: TokenSyntax = .eof(), 
-      unexpectedAfterEOFToken: UnexpectedNodesSyntax? = nil, 
+      unexpectedBetweenStatementsAndEndOfFileToken: UnexpectedNodesSyntax? = nil, 
+      endOfFileToken: TokenSyntax = .eof(), 
+      unexpectedAfterEndOfFileToken: UnexpectedNodesSyntax? = nil, 
       @CodeBlockItemListBuilder statementsBuilder: () throws -> CodeBlockItemListSyntax, 
       trailingTrivia: Trivia? = nil
     ) rethrows {
@@ -1231,9 +1231,9 @@ extension SourceFileSyntax {
         leadingTrivia: leadingTrivia, 
         unexpectedBeforeStatements, 
         statements: statementsBuilder(), 
-        unexpectedBetweenStatementsAndEOFToken, 
-        eofToken: eofToken, 
-        unexpectedAfterEOFToken, 
+        unexpectedBetweenStatementsAndEndOfFileToken, 
+        endOfFileToken: endOfFileToken, 
+        unexpectedAfterEndOfFileToken, 
         trailingTrivia: trailingTrivia
       )
   }
@@ -1292,12 +1292,12 @@ extension SubscriptExprSyntax {
       leadingTrivia: Trivia? = nil, 
       unexpectedBeforeCalledExpression: UnexpectedNodesSyntax? = nil, 
       calledExpression: ExprSyntaxProtocol, 
-      unexpectedBetweenCalledExpressionAndLeftBracket: UnexpectedNodesSyntax? = nil, 
-      leftBracket: TokenSyntax = .leftSquareToken(), 
-      unexpectedBetweenLeftBracketAndArgumentList: UnexpectedNodesSyntax? = nil, 
-      unexpectedBetweenArgumentListAndRightBracket: UnexpectedNodesSyntax? = nil, 
-      rightBracket: TokenSyntax = .rightSquareToken(), 
-      unexpectedBetweenRightBracketAndTrailingClosure: UnexpectedNodesSyntax? = nil, 
+      unexpectedBetweenCalledExpressionAndLeftSquare: UnexpectedNodesSyntax? = nil, 
+      leftSquare: TokenSyntax = .leftSquareToken(), 
+      unexpectedBetweenLeftSquareAndArgumentList: UnexpectedNodesSyntax? = nil, 
+      unexpectedBetweenArgumentListAndRightSquare: UnexpectedNodesSyntax? = nil, 
+      rightSquare: TokenSyntax = .rightSquareToken(), 
+      unexpectedBetweenRightSquareAndTrailingClosure: UnexpectedNodesSyntax? = nil, 
       trailingClosure: ClosureExprSyntax? = nil, 
       unexpectedBetweenTrailingClosureAndAdditionalTrailingClosures: UnexpectedNodesSyntax? = nil, 
       additionalTrailingClosures: MultipleTrailingClosureElementListSyntax? = nil, 
@@ -1309,13 +1309,13 @@ extension SubscriptExprSyntax {
         leadingTrivia: leadingTrivia, 
         unexpectedBeforeCalledExpression, 
         calledExpression: ExprSyntax(fromProtocol: calledExpression), 
-        unexpectedBetweenCalledExpressionAndLeftBracket, 
-        leftBracket: leftBracket, 
-        unexpectedBetweenLeftBracketAndArgumentList, 
+        unexpectedBetweenCalledExpressionAndLeftSquare, 
+        leftSquare: leftSquare, 
+        unexpectedBetweenLeftSquareAndArgumentList, 
         argumentList: argumentListBuilder(), 
-        unexpectedBetweenArgumentListAndRightBracket, 
-        rightBracket: rightBracket, 
-        unexpectedBetweenRightBracketAndTrailingClosure, 
+        unexpectedBetweenArgumentListAndRightSquare, 
+        rightSquare: rightSquare, 
+        unexpectedBetweenRightSquareAndTrailingClosure, 
         trailingClosure: trailingClosure, 
         unexpectedBetweenTrailingClosureAndAdditionalTrailingClosures, 
         additionalTrailingClosures: additionalTrailingClosures, 
diff --git a/Sources/SwiftSyntaxBuilder/generated/RenamedChildrenBuilderCompatibility.swift b/Sources/SwiftSyntaxBuilder/generated/RenamedChildrenBuilderCompatibility.swift
index 710f5733c41..85d8cc32f61 100644
--- a/Sources/SwiftSyntaxBuilder/generated/RenamedChildrenBuilderCompatibility.swift
+++ b/Sources/SwiftSyntaxBuilder/generated/RenamedChildrenBuilderCompatibility.swift
@@ -92,8 +92,74 @@ extension EnumDeclSyntax {
   }
 }
 
+extension ExpressionSegmentSyntax {
+  @available(*, deprecated, message: "Use an initializer with delimiter argument(s).")
+  @_disfavoredOverload
+  /// A convenience initializer that allows initializing syntax collections using result builders
+  public init(
+      leadingTrivia: Trivia? = nil, 
+      unexpectedBeforeBackslash: UnexpectedNodesSyntax? = nil, 
+      backslash: TokenSyntax = .backslashToken(), 
+      unexpectedBetweenBackslashAndDelimiter: UnexpectedNodesSyntax? = nil, 
+      delimiter: TokenSyntax? = nil, 
+      unexpectedBetweenDelimiterAndLeftParen: UnexpectedNodesSyntax? = nil, 
+      leftParen: TokenSyntax = .leftParenToken(), 
+      unexpectedBetweenLeftParenAndExpressions: UnexpectedNodesSyntax? = nil, 
+      unexpectedBetweenExpressionsAndRightParen: UnexpectedNodesSyntax? = nil, 
+      rightParen: TokenSyntax = .rightParenToken(), 
+      unexpectedAfterRightParen: UnexpectedNodesSyntax? = nil, 
+      @TupleExprElementListBuilder expressionsBuilder: () throws -> TupleExprElementListSyntax, 
+      trailingTrivia: Trivia? = nil
+    ) rethrows {
+    try self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeBackslash, 
+        backslash: backslash, 
+        unexpectedBetweenBackslashAndDelimiter, 
+        rawStringDelimiter: delimiter, 
+        unexpectedBetweenDelimiterAndLeftParen, 
+        leftParen: leftParen, 
+        unexpectedBetweenLeftParenAndExpressions, 
+        expressions: expressionsBuilder(), 
+        unexpectedBetweenExpressionsAndRightParen, 
+        rightParen: rightParen, 
+        unexpectedAfterRightParen, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension GenericArgumentClauseSyntax {
+  @available(*, deprecated, message: "Use an initializer with leftAngleBracket, rightAngleBracket argument(s).")
+  @_disfavoredOverload
+  /// A convenience initializer that allows initializing syntax collections using result builders
+  public init(
+      leadingTrivia: Trivia? = nil, 
+      unexpectedBeforeLeftAngleBracket: UnexpectedNodesSyntax? = nil, 
+      leftAngleBracket: TokenSyntax = .leftAngleToken(), 
+      unexpectedBetweenLeftAngleBracketAndArguments: UnexpectedNodesSyntax? = nil, 
+      unexpectedBetweenArgumentsAndRightAngleBracket: UnexpectedNodesSyntax? = nil, 
+      rightAngleBracket: TokenSyntax = .rightAngleToken(), 
+      unexpectedAfterRightAngleBracket: UnexpectedNodesSyntax? = nil, 
+      @GenericArgumentListBuilder argumentsBuilder: () throws -> GenericArgumentListSyntax, 
+      trailingTrivia: Trivia? = nil
+    ) rethrows {
+    try self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeLeftAngleBracket, 
+        leftAngle: leftAngleBracket, 
+        unexpectedBetweenLeftAngleBracketAndArguments, 
+        arguments: argumentsBuilder(), 
+        unexpectedBetweenArgumentsAndRightAngleBracket, 
+        rightAngle: rightAngleBracket, 
+        unexpectedAfterRightAngleBracket, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
 extension GenericParameterClauseSyntax {
-  @available(*, deprecated, message: "Use an initializer with genericParameterList argument(s).")
+  @available(*, deprecated, message: "Use an initializer with leftAngleBracket, genericParameterList, rightAngleBracket argument(s).")
   @_disfavoredOverload
   /// A convenience initializer that allows initializing syntax collections using result builders
   public init(
@@ -112,19 +178,220 @@ extension GenericParameterClauseSyntax {
     try self.init(
         leadingTrivia: leadingTrivia, 
         unexpectedBeforeLeftAngleBracket, 
-        leftAngleBracket: leftAngleBracket, 
+        leftAngle: leftAngleBracket, 
         unexpectedBetweenLeftAngleBracketAndGenericParameterList, 
         parameters: genericParameterListBuilder(), 
         unexpectedBetweenGenericParameterListAndGenericWhereClause, 
         genericWhereClause: genericWhereClause, 
         unexpectedBetweenGenericWhereClauseAndRightAngleBracket, 
-        rightAngleBracket: rightAngleBracket, 
+        rightAngle: rightAngleBracket, 
         unexpectedAfterRightAngleBracket, 
         trailingTrivia: trailingTrivia
       )
   }
 }
 
+extension KeyPathSubscriptComponentSyntax {
+  @available(*, deprecated, message: "Use an initializer with leftBracket, rightBracket argument(s).")
+  @_disfavoredOverload
+  /// A convenience initializer that allows initializing syntax collections using result builders
+  public init(
+      leadingTrivia: Trivia? = nil, 
+      unexpectedBeforeLeftBracket: UnexpectedNodesSyntax? = nil, 
+      leftBracket: TokenSyntax = .leftSquareToken(), 
+      unexpectedBetweenLeftBracketAndArgumentList: UnexpectedNodesSyntax? = nil, 
+      unexpectedBetweenArgumentListAndRightBracket: UnexpectedNodesSyntax? = nil, 
+      rightBracket: TokenSyntax = .rightSquareToken(), 
+      unexpectedAfterRightBracket: UnexpectedNodesSyntax? = nil, 
+      @TupleExprElementListBuilder argumentListBuilder: () throws -> TupleExprElementListSyntax, 
+      trailingTrivia: Trivia? = nil
+    ) rethrows {
+    try self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeLeftBracket, 
+        leftSquare: leftBracket, 
+        unexpectedBetweenLeftBracketAndArgumentList, 
+        argumentList: argumentListBuilder(), 
+        unexpectedBetweenArgumentListAndRightBracket, 
+        rightSquare: rightBracket, 
+        unexpectedAfterRightBracket, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension MacroExpansionDeclSyntax {
+  @available(*, deprecated, message: "Use an initializer with poundToken argument(s).")
+  @_disfavoredOverload
+  /// A convenience initializer that allows initializing syntax collections using result builders
+  public init(
+      leadingTrivia: Trivia? = nil, 
+      unexpectedBeforeAttributes: UnexpectedNodesSyntax? = nil, 
+      attributes: AttributeListSyntax? = nil, 
+      unexpectedBetweenAttributesAndModifiers: UnexpectedNodesSyntax? = nil, 
+      modifiers: ModifierListSyntax? = nil, 
+      unexpectedBetweenModifiersAndPoundToken: UnexpectedNodesSyntax? = nil, 
+      poundToken: TokenSyntax = .poundToken(), 
+      unexpectedBetweenPoundTokenAndMacro: UnexpectedNodesSyntax? = nil, 
+      macro: TokenSyntax, 
+      unexpectedBetweenMacroAndGenericArguments: UnexpectedNodesSyntax? = nil, 
+      genericArguments: GenericArgumentClauseSyntax? = nil, 
+      unexpectedBetweenGenericArgumentsAndLeftParen: UnexpectedNodesSyntax? = nil, 
+      leftParen: TokenSyntax? = nil, 
+      unexpectedBetweenLeftParenAndArgumentList: UnexpectedNodesSyntax? = nil, 
+      unexpectedBetweenArgumentListAndRightParen: UnexpectedNodesSyntax? = nil, 
+      rightParen: TokenSyntax? = nil, 
+      unexpectedBetweenRightParenAndTrailingClosure: UnexpectedNodesSyntax? = nil, 
+      trailingClosure: ClosureExprSyntax? = nil, 
+      unexpectedBetweenTrailingClosureAndAdditionalTrailingClosures: UnexpectedNodesSyntax? = nil, 
+      additionalTrailingClosures: MultipleTrailingClosureElementListSyntax? = nil, 
+      unexpectedAfterAdditionalTrailingClosures: UnexpectedNodesSyntax? = nil, 
+      @TupleExprElementListBuilder argumentListBuilder: () throws -> TupleExprElementListSyntax, 
+      trailingTrivia: Trivia? = nil
+    ) rethrows {
+    try self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeAttributes, 
+        attributes: attributes, 
+        unexpectedBetweenAttributesAndModifiers, 
+        modifiers: modifiers, 
+        unexpectedBetweenModifiersAndPoundToken, 
+        pound: poundToken, 
+        unexpectedBetweenPoundTokenAndMacro, 
+        macro: macro, 
+        unexpectedBetweenMacroAndGenericArguments, 
+        genericArguments: genericArguments, 
+        unexpectedBetweenGenericArgumentsAndLeftParen, 
+        leftParen: leftParen, 
+        unexpectedBetweenLeftParenAndArgumentList, 
+        argumentList: argumentListBuilder(), 
+        unexpectedBetweenArgumentListAndRightParen, 
+        rightParen: rightParen, 
+        unexpectedBetweenRightParenAndTrailingClosure, 
+        trailingClosure: trailingClosure, 
+        unexpectedBetweenTrailingClosureAndAdditionalTrailingClosures, 
+        additionalTrailingClosures: additionalTrailingClosures, 
+        unexpectedAfterAdditionalTrailingClosures, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension MacroExpansionExprSyntax {
+  @available(*, deprecated, message: "Use an initializer with poundToken argument(s).")
+  @_disfavoredOverload
+  /// A convenience initializer that allows initializing syntax collections using result builders
+  public init(
+      leadingTrivia: Trivia? = nil, 
+      unexpectedBeforePoundToken: UnexpectedNodesSyntax? = nil, 
+      poundToken: TokenSyntax = .poundToken(), 
+      unexpectedBetweenPoundTokenAndMacro: UnexpectedNodesSyntax? = nil, 
+      macro: TokenSyntax, 
+      unexpectedBetweenMacroAndGenericArguments: UnexpectedNodesSyntax? = nil, 
+      genericArguments: GenericArgumentClauseSyntax? = nil, 
+      unexpectedBetweenGenericArgumentsAndLeftParen: UnexpectedNodesSyntax? = nil, 
+      leftParen: TokenSyntax? = nil, 
+      unexpectedBetweenLeftParenAndArgumentList: UnexpectedNodesSyntax? = nil, 
+      unexpectedBetweenArgumentListAndRightParen: UnexpectedNodesSyntax? = nil, 
+      rightParen: TokenSyntax? = nil, 
+      unexpectedBetweenRightParenAndTrailingClosure: UnexpectedNodesSyntax? = nil, 
+      trailingClosure: ClosureExprSyntax? = nil, 
+      unexpectedBetweenTrailingClosureAndAdditionalTrailingClosures: UnexpectedNodesSyntax? = nil, 
+      additionalTrailingClosures: MultipleTrailingClosureElementListSyntax? = nil, 
+      unexpectedAfterAdditionalTrailingClosures: UnexpectedNodesSyntax? = nil, 
+      @TupleExprElementListBuilder argumentListBuilder: () throws -> TupleExprElementListSyntax, 
+      trailingTrivia: Trivia? = nil
+    ) rethrows {
+    try self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforePoundToken, 
+        pound: poundToken, 
+        unexpectedBetweenPoundTokenAndMacro, 
+        macro: macro, 
+        unexpectedBetweenMacroAndGenericArguments, 
+        genericArguments: genericArguments, 
+        unexpectedBetweenGenericArgumentsAndLeftParen, 
+        leftParen: leftParen, 
+        unexpectedBetweenLeftParenAndArgumentList, 
+        argumentList: argumentListBuilder(), 
+        unexpectedBetweenArgumentListAndRightParen, 
+        rightParen: rightParen, 
+        unexpectedBetweenRightParenAndTrailingClosure, 
+        trailingClosure: trailingClosure, 
+        unexpectedBetweenTrailingClosureAndAdditionalTrailingClosures, 
+        additionalTrailingClosures: additionalTrailingClosures, 
+        unexpectedAfterAdditionalTrailingClosures, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension SourceFileSyntax {
+  @available(*, deprecated, message: "Use an initializer with eOFToken argument(s).")
+  @_disfavoredOverload
+  /// A convenience initializer that allows initializing syntax collections using result builders
+  public init(
+      leadingTrivia: Trivia? = nil, 
+      unexpectedBeforeStatements: UnexpectedNodesSyntax? = nil, 
+      unexpectedBetweenStatementsAndEOFToken: UnexpectedNodesSyntax? = nil, 
+      eofToken: TokenSyntax = .eof(), 
+      unexpectedAfterEOFToken: UnexpectedNodesSyntax? = nil, 
+      @CodeBlockItemListBuilder statementsBuilder: () throws -> CodeBlockItemListSyntax, 
+      trailingTrivia: Trivia? = nil
+    ) rethrows {
+    try self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeStatements, 
+        statements: statementsBuilder(), 
+        unexpectedBetweenStatementsAndEOFToken, 
+        endOfFileToken: eofToken, 
+        unexpectedAfterEOFToken, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
+extension SubscriptExprSyntax {
+  @available(*, deprecated, message: "Use an initializer with leftBracket, rightBracket argument(s).")
+  @_disfavoredOverload
+  /// A convenience initializer that allows initializing syntax collections using result builders
+  public init(
+      leadingTrivia: Trivia? = nil, 
+      unexpectedBeforeCalledExpression: UnexpectedNodesSyntax? = nil, 
+      calledExpression: ExprSyntaxProtocol, 
+      unexpectedBetweenCalledExpressionAndLeftBracket: UnexpectedNodesSyntax? = nil, 
+      leftBracket: TokenSyntax = .leftSquareToken(), 
+      unexpectedBetweenLeftBracketAndArgumentList: UnexpectedNodesSyntax? = nil, 
+      unexpectedBetweenArgumentListAndRightBracket: UnexpectedNodesSyntax? = nil, 
+      rightBracket: TokenSyntax = .rightSquareToken(), 
+      unexpectedBetweenRightBracketAndTrailingClosure: UnexpectedNodesSyntax? = nil, 
+      trailingClosure: ClosureExprSyntax? = nil, 
+      unexpectedBetweenTrailingClosureAndAdditionalTrailingClosures: UnexpectedNodesSyntax? = nil, 
+      additionalTrailingClosures: MultipleTrailingClosureElementListSyntax? = nil, 
+      unexpectedAfterAdditionalTrailingClosures: UnexpectedNodesSyntax? = nil, 
+      @TupleExprElementListBuilder argumentListBuilder: () throws -> TupleExprElementListSyntax, 
+      trailingTrivia: Trivia? = nil
+    ) rethrows {
+    try self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeCalledExpression, 
+        calledExpression: ExprSyntax(fromProtocol: calledExpression), 
+        unexpectedBetweenCalledExpressionAndLeftBracket, 
+        leftSquare: leftBracket, 
+        unexpectedBetweenLeftBracketAndArgumentList, 
+        argumentList: argumentListBuilder(), 
+        unexpectedBetweenArgumentListAndRightBracket, 
+        rightSquare: rightBracket, 
+        unexpectedBetweenRightBracketAndTrailingClosure, 
+        trailingClosure: trailingClosure, 
+        unexpectedBetweenTrailingClosureAndAdditionalTrailingClosures, 
+        additionalTrailingClosures: additionalTrailingClosures, 
+        unexpectedAfterAdditionalTrailingClosures, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
 extension TupleExprSyntax {
   @available(*, deprecated, message: "Use an initializer with elementList argument(s).")
   @_disfavoredOverload
diff --git a/Tests/SwiftParserTest/DeclarationTests.swift b/Tests/SwiftParserTest/DeclarationTests.swift
index deef445e813..1d61d99bfdf 100644
--- a/Tests/SwiftParserTest/DeclarationTests.swift
+++ b/Tests/SwiftParserTest/DeclarationTests.swift
@@ -1662,7 +1662,7 @@ final class DeclarationTests: XCTestCase {
       """,
       substructure: Syntax(
         MacroExpansionDeclSyntax(
-          poundToken: .poundToken(),
+          pound: .poundToken(),
           macro: .identifier("case"),
           argumentList: TupleExprElementListSyntax([])
         )
@@ -1829,7 +1829,7 @@ final class DeclarationTests: XCTestCase {
       substructure: Syntax(
         MacroExpansionDeclSyntax(
           attributes: [.attribute(AttributeSyntax(attributeName: TypeSyntax("attrib")))],
-          poundToken: .poundToken(),
+          pound: .poundToken(),
           macro: .identifier("class"),
           argumentList: []
         )
@@ -1844,7 +1844,7 @@ final class DeclarationTests: XCTestCase {
       """,
       substructure: Syntax(
         MacroExpansionDeclSyntax(
-          poundToken: .poundToken(),
+          pound: .poundToken(),
           macro: .identifier("struct"),
           argumentList: []
         )
diff --git a/Tests/SwiftParserTest/ExpressionTests.swift b/Tests/SwiftParserTest/ExpressionTests.swift
index 7c39ce758f6..fadd7517c8e 100644
--- a/Tests/SwiftParserTest/ExpressionTests.swift
+++ b/Tests/SwiftParserTest/ExpressionTests.swift
@@ -390,7 +390,7 @@ final class ExpressionTests: XCTestCase {
       substructure: Syntax(
         DictionaryElementSyntax.init(
           keyExpression: MacroExpansionExprSyntax(
-            poundToken: .poundToken(),
+            pound: .poundToken(),
             macro: .identifier("line"),
             argumentList: TupleExprElementListSyntax([])
           ),
@@ -403,7 +403,7 @@ final class ExpressionTests: XCTestCase {
                 label: .identifier("identifier"),
                 colon: .colonToken(),
                 expression: MemberAccessExprSyntax(
-                  dot: .periodToken(),
+                  period: .periodToken(),
                   name: .identifier("buddhist")
                 )
               )
@@ -1156,7 +1156,7 @@ final class ExpressionTests: XCTestCase {
       "#case",
       substructure: Syntax(
         MacroExpansionExprSyntax(
-          poundToken: .poundToken(),
+          pound: .poundToken(),
           macro: .identifier("case"),
           argumentList: TupleExprElementListSyntax([])
         )
diff --git a/Tests/SwiftParserTest/PatternTests.swift b/Tests/SwiftParserTest/PatternTests.swift
index 1d47d87c446..af439b0c92a 100644
--- a/Tests/SwiftParserTest/PatternTests.swift
+++ b/Tests/SwiftParserTest/PatternTests.swift
@@ -80,11 +80,11 @@ final class PatternTests: XCTestCase {
               .init(
                 expression: SubscriptExprSyntax(
                   calledExpression: IdentifierExprSyntax(identifier: .identifier("y")),
-                  leftBracket: .leftSquareToken(),
+                  leftSquare: .leftSquareToken(),
                   argumentList: TupleExprElementListSyntax([
                     .init(expression: IntegerLiteralExprSyntax(digits: .integerLiteral("0")))
                   ]),
-                  rightBracket: .rightSquareToken()
+                  rightSquare: .rightSquareToken()
                 ),
                 trailingComma: .commaToken()
               ),
diff --git a/Tests/SwiftParserTest/RegexLiteralTests.swift b/Tests/SwiftParserTest/RegexLiteralTests.swift
index 3348b1a0a50..18001246b2b 100644
--- a/Tests/SwiftParserTest/RegexLiteralTests.swift
+++ b/Tests/SwiftParserTest/RegexLiteralTests.swift
@@ -1261,7 +1261,7 @@ final class RegexLiteralTests: XCTestCase {
       """
       let x = true?/abc/1️⃣:/def/
       """,
-      substructure: Syntax(BinaryOperatorExprSyntax(operatorToken: .binaryOperator("/"))),
+      substructure: Syntax(BinaryOperatorExprSyntax(operator: .binaryOperator("/"))),
       diagnostics: [
         DiagnosticSpec(message: "extraneous code ':/def/' at top level")
       ]
diff --git a/Tests/SwiftParserTest/StatementTests.swift b/Tests/SwiftParserTest/StatementTests.swift
index c06cadef5a1..c5e942b4b48 100644
--- a/Tests/SwiftParserTest/StatementTests.swift
+++ b/Tests/SwiftParserTest/StatementTests.swift
@@ -370,7 +370,7 @@ final class StatementTests: XCTestCase {
           period: .periodToken(),
           name: .identifier("Optional"),
           genericArgumentClause: GenericArgumentClauseSyntax(
-            leftAngleBracket: .leftAngleToken(),
+            leftAngle: .leftAngleToken(),
             arguments: GenericArgumentListSyntax([
               GenericArgumentSyntax(
                 argumentType: OptionalTypeSyntax(
@@ -379,7 +379,7 @@ final class StatementTests: XCTestCase {
                 )
               )
             ]),
-            rightAngleBracket: .rightAngleToken()
+            rightAngle: .rightAngleToken()
           )
         )
       ),
@@ -394,13 +394,13 @@ final class StatementTests: XCTestCase {
         SpecializeExprSyntax(
           expression: IdentifierExprSyntax(identifier: .identifier("Optional")),
           genericArgumentClause: GenericArgumentClauseSyntax(
-            leftAngleBracket: .leftAngleToken(),
+            leftAngle: .leftAngleToken(),
             arguments: GenericArgumentListSyntax([
               GenericArgumentSyntax(
                 argumentType: SimpleTypeIdentifierSyntax(name: .keyword(.Any))
               )
             ]),
-            rightAngleBracket: .rightAngleToken()
+            rightAngle: .rightAngleToken()
           )
         )
       ),
@@ -563,7 +563,7 @@ final class StatementTests: XCTestCase {
         SequenceExprSyntax(
           elements: ExprListSyntax([
             IdentifierExprSyntax(identifier: .identifier("yield")),
-            BinaryOperatorExprSyntax(operatorToken: .binaryOperator("&")),
+            BinaryOperatorExprSyntax(operator: .binaryOperator("&")),
             IntegerLiteralExprSyntax(5),
           ])
         )
@@ -581,7 +581,7 @@ final class StatementTests: XCTestCase {
         SequenceExprSyntax(
           elements: ExprListSyntax([
             IdentifierExprSyntax(identifier: .identifier("yield")),
-            BinaryOperatorExprSyntax(operatorToken: .binaryOperator("&")),
+            BinaryOperatorExprSyntax(operator: .binaryOperator("&")),
             IntegerLiteralExprSyntax(5),
           ])
         )
diff --git a/Tests/SwiftParserTest/VariadicGenericsTests.swift b/Tests/SwiftParserTest/VariadicGenericsTests.swift
index e639c93e31d..1e5eb472ba8 100644
--- a/Tests/SwiftParserTest/VariadicGenericsTests.swift
+++ b/Tests/SwiftParserTest/VariadicGenericsTests.swift
@@ -269,7 +269,7 @@ final class VariadicGenericsTests: XCTestCase {
               ),
               ExprSyntax(
                 BinaryOperatorExprSyntax(
-                  operatorToken: .binaryOperator("+")
+                  operator: .binaryOperator("+")
                 )
               ),
               ExprSyntax(
@@ -282,7 +282,7 @@ final class VariadicGenericsTests: XCTestCase {
               ),
               ExprSyntax(
                 BinaryOperatorExprSyntax(
-                  operatorToken: .binaryOperator("+")
+                  operator: .binaryOperator("+")
                 )
               ),
               ExprSyntax(
diff --git a/Tests/SwiftParserTest/translated/ForwardSlashRegexTests.swift b/Tests/SwiftParserTest/translated/ForwardSlashRegexTests.swift
index 2216e62022e..310ff9d0ce8 100644
--- a/Tests/SwiftParserTest/translated/ForwardSlashRegexTests.swift
+++ b/Tests/SwiftParserTest/translated/ForwardSlashRegexTests.swift
@@ -266,7 +266,7 @@ final class ForwardSlashRegexTests: XCTestCase {
           .blah
       }
       """,
-      substructure: Syntax(BinaryOperatorExprSyntax(operatorToken: .binaryOperator("/?")))
+      substructure: Syntax(BinaryOperatorExprSyntax(operator: .binaryOperator("/?")))
     )
   }
 
@@ -371,8 +371,8 @@ final class ForwardSlashRegexTests: XCTestCase {
                 expression: RegexLiteralExprSyntax(regexPattern: .regexLiteralPattern("x"))
               )
             ),
-            BinaryOperatorExprSyntax(operatorToken: .binaryOperator("/")),
-            PostfixUnaryExprSyntax(expression: IdentifierExprSyntax(identifier: "x"), operatorToken: .postfixOperator("/")),
+            BinaryOperatorExprSyntax(operator: .binaryOperator("/")),
+            PostfixUnaryExprSyntax(expression: IdentifierExprSyntax(identifier: "x"), operator: .postfixOperator("/")),
           ])
         )
       )
@@ -393,7 +393,7 @@ final class ForwardSlashRegexTests: XCTestCase {
       """
       _ = /x/.../y/
       """,
-      substructure: Syntax(BinaryOperatorExprSyntax(operatorToken: .binaryOperator(".../")))
+      substructure: Syntax(BinaryOperatorExprSyntax(operator: .binaryOperator(".../")))
     )
   }
 
@@ -740,7 +740,7 @@ final class ForwardSlashRegexTests: XCTestCase {
         2
       }
       """,
-      substructure: Syntax(BinaryOperatorExprSyntax(operatorToken: .binaryOperator("/")))
+      substructure: Syntax(BinaryOperatorExprSyntax(operator: .binaryOperator("/")))
     )
   }
 
@@ -763,7 +763,7 @@ final class ForwardSlashRegexTests: XCTestCase {
       _ = 2
       / 1 / .bitWidth
       """,
-      substructure: Syntax(BinaryOperatorExprSyntax(operatorToken: .binaryOperator("/")))
+      substructure: Syntax(BinaryOperatorExprSyntax(operator: .binaryOperator("/")))
     )
   }
 
@@ -786,7 +786,7 @@ final class ForwardSlashRegexTests: XCTestCase {
       / 1 /
         .bitWidth
       """,
-      substructure: Syntax(BinaryOperatorExprSyntax(operatorToken: .binaryOperator("/")))
+      substructure: Syntax(BinaryOperatorExprSyntax(operator: .binaryOperator("/")))
     )
   }
 
@@ -798,7 +798,7 @@ final class ForwardSlashRegexTests: XCTestCase {
       /1 /
         .bitWidth
       """,
-      substructure: Syntax(BinaryOperatorExprSyntax(operatorToken: .binaryOperator("/")))
+      substructure: Syntax(BinaryOperatorExprSyntax(operator: .binaryOperator("/")))
     )
   }
 
@@ -810,7 +810,7 @@ final class ForwardSlashRegexTests: XCTestCase {
       """,
       substructure: Syntax(
         PrefixOperatorExprSyntax(
-          operatorToken: .prefixOperator("!!"),
+          operator: .prefixOperator("!!"),
           postfixExpression: MemberAccessExprSyntax(
             base: RegexLiteralExprSyntax(regexPattern: .regexLiteralPattern("1")),
             name: "bitWidth"
@@ -826,7 +826,7 @@ final class ForwardSlashRegexTests: XCTestCase {
       """
       _ = !!/1 / .bitWidth
       """,
-      substructure: Syntax(BinaryOperatorExprSyntax(operatorToken: .binaryOperator("/")))
+      substructure: Syntax(BinaryOperatorExprSyntax(operator: .binaryOperator("/")))
     )
   }
 
@@ -1058,7 +1058,7 @@ final class ForwardSlashRegexTests: XCTestCase {
       """
       _ = /x// comment
       """,
-      substructure: Syntax(PrefixOperatorExprSyntax(operatorToken: .prefixOperator("/"), postfixExpression: IdentifierExprSyntax(identifier: "x")))
+      substructure: Syntax(PrefixOperatorExprSyntax(operator: .prefixOperator("/"), postfixExpression: IdentifierExprSyntax(identifier: "x")))
     )
   }
 
@@ -1067,7 +1067,7 @@ final class ForwardSlashRegexTests: XCTestCase {
       """
       _ = /x // comment
       """,
-      substructure: Syntax(PrefixOperatorExprSyntax(operatorToken: .prefixOperator("/"), postfixExpression: IdentifierExprSyntax(identifier: "x")))
+      substructure: Syntax(PrefixOperatorExprSyntax(operator: .prefixOperator("/"), postfixExpression: IdentifierExprSyntax(identifier: "x")))
     )
   }
 
@@ -1076,7 +1076,7 @@ final class ForwardSlashRegexTests: XCTestCase {
       """
       _ = /x/*comment*/
       """,
-      substructure: Syntax(PrefixOperatorExprSyntax(operatorToken: .prefixOperator("/"), postfixExpression: IdentifierExprSyntax(identifier: "x")))
+      substructure: Syntax(PrefixOperatorExprSyntax(operator: .prefixOperator("/"), postfixExpression: IdentifierExprSyntax(identifier: "x")))
     )
   }
 
diff --git a/Tests/SwiftParserTest/translated/HashbangLibraryTests.swift b/Tests/SwiftParserTest/translated/HashbangLibraryTests.swift
index 4fb1a5d4d94..98130813138 100644
--- a/Tests/SwiftParserTest/translated/HashbangLibraryTests.swift
+++ b/Tests/SwiftParserTest/translated/HashbangLibraryTests.swift
@@ -49,7 +49,7 @@ final class HashbangLibraryTests: XCTestCase {
               )
             )
           ]),
-          eofToken: .eof()
+          endOfFileToken: .eof()
         )
       ),
       options: [.substructureCheckTrivia]
diff --git a/Tests/SwiftParserTest/translated/IfconfigExprTests.swift b/Tests/SwiftParserTest/translated/IfconfigExprTests.swift
index 76e8f733c3b..cc8f529a325 100644
--- a/Tests/SwiftParserTest/translated/IfconfigExprTests.swift
+++ b/Tests/SwiftParserTest/translated/IfconfigExprTests.swift
@@ -660,8 +660,8 @@ final class IfconfigExprTests: XCTestCase {
           argumentList: TupleExprElementListSyntax([
             TupleExprElementSyntax(
               expression: PrefixOperatorExprSyntax(
-                operatorToken: .prefixOperator("<"),
-                postfixExpression: FloatLiteralExprSyntax(floatingDigits: .floatingLiteral("10.0"))
+                operator: .prefixOperator("<"),
+                postfixExpression: FloatLiteralExprSyntax(digits: .floatingLiteral("10.0"))
               )
             )
           ]),
diff --git a/Tests/SwiftSyntaxBuilderTest/FloatLiteralTests.swift b/Tests/SwiftSyntaxBuilderTest/FloatLiteralTests.swift
index d09e3114dd1..bad028b2e29 100644
--- a/Tests/SwiftSyntaxBuilderTest/FloatLiteralTests.swift
+++ b/Tests/SwiftSyntaxBuilderTest/FloatLiteralTests.swift
@@ -17,10 +17,10 @@ import SwiftSyntaxBuilder
 final class FloatLiteralTests: XCTestCase {
   func testFloatLiteral() {
     let testCases: [UInt: (FloatLiteralExprSyntax, String)] = [
-      #line: (FloatLiteralExprSyntax(floatingDigits: .floatingLiteral(String(123.321))), "123.321"),
-      #line: (FloatLiteralExprSyntax(floatingDigits: .floatingLiteral(String(-123.321))), "-123.321"),
-      #line: (FloatLiteralExprSyntax(floatingDigits: .floatingLiteral("2_123.321")), "2_123.321"),
-      #line: (FloatLiteralExprSyntax(floatingDigits: .floatingLiteral("-2_123.321")), "-2_123.321"),
+      #line: (FloatLiteralExprSyntax(digits: .floatingLiteral(String(123.321))), "123.321"),
+      #line: (FloatLiteralExprSyntax(digits: .floatingLiteral(String(-123.321))), "-123.321"),
+      #line: (FloatLiteralExprSyntax(digits: .floatingLiteral("2_123.321")), "2_123.321"),
+      #line: (FloatLiteralExprSyntax(digits: .floatingLiteral("-2_123.321")), "-2_123.321"),
       #line: (FloatLiteralExprSyntax(2_123.321), "2123.321"),
       #line: (FloatLiteralExprSyntax(-2_123.321), "-2123.321"),
       #line: (2_123.321, "2123.321"),
diff --git a/Tests/SwiftSyntaxBuilderTest/FunctionTests.swift b/Tests/SwiftSyntaxBuilderTest/FunctionTests.swift
index 0ca9be0eb32..b08bec76cb5 100644
--- a/Tests/SwiftSyntaxBuilderTest/FunctionTests.swift
+++ b/Tests/SwiftSyntaxBuilderTest/FunctionTests.swift
@@ -225,7 +225,7 @@ final class FunctionTests: XCTestCase {
                 expression: SequenceExprSyntax(
                   elements: ExprListSyntax {
                     IdentifierExprSyntax(identifier: .identifier("lhs"))
-                    BinaryOperatorExprSyntax(operatorToken: .binaryOperator("<"))
+                    BinaryOperatorExprSyntax(operator: .binaryOperator("<"))
                     IdentifierExprSyntax(identifier: .identifier("rhs"))
                   }
                 )
@@ -262,7 +262,7 @@ final class FunctionTests: XCTestCase {
                 expression: SequenceExprSyntax(
                   elements: ExprListSyntax {
                     ExprSyntax("(lhs1, lhs2)")
-                    BinaryOperatorExprSyntax(operatorToken: .binaryOperator("<"))
+                    BinaryOperatorExprSyntax(operator: .binaryOperator("<"))
                     ExprSyntax("(rhs1, rhs2)")
                   }
                 )
diff --git a/Tests/SwiftSyntaxTest/AbsolutePositionTests.swift b/Tests/SwiftSyntaxTest/AbsolutePositionTests.swift
index 8c06731e863..3ce543abdc9 100644
--- a/Tests/SwiftSyntaxTest/AbsolutePositionTests.swift
+++ b/Tests/SwiftSyntaxTest/AbsolutePositionTests.swift
@@ -31,7 +31,7 @@ public class AbsolutePositionTests: XCTestCase {
     }
     let root = SourceFileSyntax(
       statements: CodeBlockItemListSyntax(l),
-      eofToken: .eof()
+      endOfFileToken: .eof()
     )
     _ = root.statements[idx].position
     _ = root.statements[idx].byteSize
@@ -67,7 +67,7 @@ public class AbsolutePositionTests: XCTestCase {
       )
     return SourceFileSyntax(
       statements: CodeBlockItemListSyntax(items),
-      eofToken: .eof()
+      endOfFileToken: .eof()
     )
   }
 
diff --git a/Tests/SwiftSyntaxTest/MultithreadingTests.swift b/Tests/SwiftSyntaxTest/MultithreadingTests.swift
index a87e9bd71c9..29eede152c6 100644
--- a/Tests/SwiftSyntaxTest/MultithreadingTests.swift
+++ b/Tests/SwiftSyntaxTest/MultithreadingTests.swift
@@ -41,7 +41,7 @@ public class MultithreadingTests: XCTestCase {
         base: IdentifierExprSyntax(
           identifier: .identifier("base")
         ),
-        dot: .periodToken(),
+        period: .periodToken(),
         name: .identifier("member")
       ),
       leftParen: .leftParenToken(),
diff --git a/Tests/SwiftSyntaxTest/SourceLocationConverterTests.swift b/Tests/SwiftSyntaxTest/SourceLocationConverterTests.swift
index 15d8aa451ff..28ed185c14d 100644
--- a/Tests/SwiftSyntaxTest/SourceLocationConverterTests.swift
+++ b/Tests/SwiftSyntaxTest/SourceLocationConverterTests.swift
@@ -54,7 +54,7 @@ final class SourceLocationConverterTests: XCTestCase {
       return Syntax(raw: nodeWithInvalidUtf8.raw, rawNodeArena: arena).cast(TokenSyntax.self)
     }
 
-    let tree = SourceFileSyntax(statements: [], eofToken: eofToken)
+    let tree = SourceFileSyntax(statements: [], endOfFileToken: eofToken)
 
     // This used to violate the following assertion in the SourceLocationConverter's
     // initializer, because we were using `String` which was lossy when handling the
diff --git a/Tests/SwiftSyntaxTest/SyntaxCreationTests.swift b/Tests/SwiftSyntaxTest/SyntaxCreationTests.swift
index 83764c0e95d..72d2784b302 100644
--- a/Tests/SwiftSyntaxTest/SyntaxCreationTests.swift
+++ b/Tests/SwiftSyntaxTest/SyntaxCreationTests.swift
@@ -204,7 +204,7 @@ public class SyntaxCreationTests: XCTestCase {
     let operatorNames = ["==", "!=", "+", "-", "*", "/", "<", ">", "<=", ">="]
     operatorNames.forEach { operatorName in
       let operatorToken = TokenSyntax.binaryOperator(operatorName, leadingTrivia: .space, trailingTrivia: .space)
-      let operatorExpr = BinaryOperatorExprSyntax(operatorToken: operatorToken)
+      let operatorExpr = BinaryOperatorExprSyntax(operator: operatorToken)
       let exprList = ExprListSyntax([
         ExprSyntax(first),
         ExprSyntax(operatorExpr),