Abbreviate "parameter" -> "param" (#3392)

Part of switching to the [abbreviations we've decided to
use](https://docs.google.com/document/d/1RRYMm42osyqhI2LyjrjockYCutQ5dOf8Abu50kTrkX0/edit?resourcekey=0-kHyqOESbOHmzZphUbtLrTw#heading=h.pph7i5m5un7q).

I will rename files in a follow-up PR.

---------

Co-authored-by: Jon Ross-Perkins <jperkins@google.com>

toolchain/check/context.cpp

@@ -818,11 +818,11 @@ class TypeCompleter {
       case SemIR::NameReference::Kind:
       case SemIR::Namespace::Kind:
       case SemIR::NoOp::Kind:
-      case SemIR::Parameter::Kind:
+      case SemIR::Param::Kind:
       case SemIR::RealLiteral::Kind:
       case SemIR::Return::Kind:
       case SemIR::ReturnExpr::Kind:
-      case SemIR::SelfParameter::Kind:
+      case SemIR::SelfParam::Kind:
       case SemIR::SpliceBlock::Kind:
       case SemIR::StringLiteral::Kind:
       case SemIR::StructAccess::Kind:

toolchain/check/convert.cpp

@@ -962,7 +962,7 @@ CARBON_DIAGNOSTIC(InCallToFunction, Note, "Calling function declared here.");
 // Convert the object argument in a method call to match the `self` parameter.
 static auto ConvertSelf(Context& context, Parse::Node call_parse_node,
                         Parse::Node callee_parse_node,
-                        SemIR::SelfParameter self_param, SemIR::InstId self_id)
+                        SemIR::SelfParam self_param, SemIR::InstId self_id)
     -> SemIR::InstId {
   if (!self_id.is_valid()) {
     CARBON_DIAGNOSTIC(MissingObjectInMethodCall, Error,
@@ -1045,7 +1045,7 @@ auto ConvertCallArgs(Context& context, Parse::Node call_parse_node,
   // Check implicit parameters.
   for (auto implicit_param_id : implicit_param_refs) {
     auto param = context.insts().Get(implicit_param_id);
-    if (auto self_param = param.TryAs<SemIR::SelfParameter>()) {
+    if (auto self_param = param.TryAs<SemIR::SelfParam>()) {
       auto converted_self_id = ConvertSelf(
           context, call_parse_node, callee_parse_node, *self_param, self_id);
       if (converted_self_id == SemIR::InstId::BuiltinError) {

toolchain/check/handle_function.cpp

@@ -50,11 +50,10 @@ static auto BuildFunctionDecl(Context& context, bool is_definition)
   }
 
   SemIR::InstBlockId param_refs_id =
-      context.node_stack().Pop<Parse::NodeKind::ParameterList>();
+      context.node_stack().Pop<Parse::NodeKind::ParamList>();
   SemIR::InstBlockId implicit_param_refs_id =
-      context.node_stack()
-          .PopIf<Parse::NodeKind::ImplicitParameterList>()
-          .value_or(SemIR::InstBlockId::Empty);
+      context.node_stack().PopIf<Parse::NodeKind::ImplicitParamList>().value_or(
+          SemIR::InstBlockId::Empty);
   auto name_context = context.decl_name_stack().FinishName();
   auto fn_node =
       context.node_stack()
@@ -205,10 +204,10 @@ auto HandleFunctionDefinitionStart(Context& context, Parse::Node parse_node)
           context.sem_ir().StringifyType(param.type_id(), true));
     });
 
-    if (auto fn_param = param.TryAs<SemIR::Parameter>()) {
+    if (auto fn_param = param.TryAs<SemIR::Param>()) {
       context.AddNameToLookup(fn_param->parse_node, fn_param->name_id,
                               param_id);
-    } else if (auto self_param = param.TryAs<SemIR::SelfParameter>()) {
+    } else if (auto self_param = param.TryAs<SemIR::SelfParam>()) {
       context.AddNameToLookup(self_param->parse_node, SemIR::NameId::SelfValue,
                               param_id);
     } else {

toolchain/check/handle_name.cpp

@@ -156,7 +156,7 @@ auto HandleMemberAccessExpr(Context& context, Parse::Node parse_node) -> bool {
         auto& function = context.functions().Get(function_decl->function_id);
         for (auto param_id :
              context.inst_blocks().Get(function.implicit_param_refs_id)) {
-          if (context.insts().Get(param_id).Is<SemIR::SelfParameter>()) {
+          if (context.insts().Get(param_id).Is<SemIR::SelfParam>()) {
             context.AddInstAndPush(
                 parse_node,
                 SemIR::BoundMethod{

toolchain/check/handle_parameter_list.cpp

@@ -6,20 +6,17 @@
 
 namespace Carbon::Check {
 
-auto HandleImplicitParameterList(Context& context, Parse::Node parse_node)
-    -> bool {
-  auto refs_id =
-      context.ParamOrArgEnd(Parse::NodeKind::ImplicitParameterListStart);
+auto HandleImplicitParamList(Context& context, Parse::Node parse_node) -> bool {
+  auto refs_id = context.ParamOrArgEnd(Parse::NodeKind::ImplicitParamListStart);
   context.node_stack()
-      .PopAndDiscardSoloParseNode<
-          Parse::NodeKind::ImplicitParameterListStart>();
+      .PopAndDiscardSoloParseNode<Parse::NodeKind::ImplicitParamListStart>();
   context.node_stack().Push(parse_node, refs_id);
   // The implicit parameter list's scope extends to the end of the following
   // parameter list.
   return true;
 }
 
-auto HandleImplicitParameterListStart(Context& context, Parse::Node parse_node)
+auto HandleImplicitParamListStart(Context& context, Parse::Node parse_node)
     -> bool {
   context.PushScope();
   context.node_stack().Push(parse_node);
@@ -27,23 +24,22 @@ auto HandleImplicitParameterListStart(Context& context, Parse::Node parse_node)
   return true;
 }
 
-auto HandleParameterList(Context& context, Parse::Node parse_node) -> bool {
-  auto refs_id = context.ParamOrArgEnd(Parse::NodeKind::ParameterListStart);
+auto HandleParamList(Context& context, Parse::Node parse_node) -> bool {
+  auto refs_id = context.ParamOrArgEnd(Parse::NodeKind::ParamListStart);
   context.PopScope();
   context.node_stack()
-      .PopAndDiscardSoloParseNode<Parse::NodeKind::ParameterListStart>();
+      .PopAndDiscardSoloParseNode<Parse::NodeKind::ParamListStart>();
   context.node_stack().Push(parse_node, refs_id);
   return true;
 }
 
-auto HandleParameterListComma(Context& context, Parse::Node /*parse_node*/)
+auto HandleParamListComma(Context& context, Parse::Node /*parse_node*/)
     -> bool {
   context.ParamOrArgComma();
   return true;
 }
 
-auto HandleParameterListStart(Context& context, Parse::Node parse_node)
-    -> bool {
+auto HandleParamListStart(Context& context, Parse::Node parse_node) -> bool {
   // A parameter list following an implicit parameter list shares the same
   // scope.
   //
@@ -53,7 +49,7 @@ auto HandleParameterListStart(Context& context, Parse::Node parse_node)
   //
   // ... all the earlier parameter should be in scope in the later parameter
   // lists too.
-  if (!context.node_stack().PeekIs<Parse::NodeKind::ImplicitParameterList>()) {
+  if (!context.node_stack().PeekIs<Parse::NodeKind::ImplicitParamList>()) {
     context.PushScope();
   }
   context.node_stack().Push(parse_node);

toolchain/check/handle_pattern_binding.cpp

@@ -13,13 +13,13 @@ auto HandleAddress(Context& context, Parse::Node parse_node) -> bool {
   auto self_param_id =
       context.node_stack().Peek<Parse::NodeKind::PatternBinding>();
   if (auto self_param =
-          context.insts().Get(self_param_id).TryAs<SemIR::SelfParameter>()) {
+          context.insts().Get(self_param_id).TryAs<SemIR::SelfParam>()) {
     self_param->is_addr_self = SemIR::BoolValue::True;
     context.insts().Set(self_param_id, *self_param);
   } else {
-    CARBON_DIAGNOSTIC(AddrOnNonSelfParameter, Error,
+    CARBON_DIAGNOSTIC(AddrOnNonSelfParam, Error,
                       "`addr` can only be applied to a `self` parameter.");
-    context.emitter().Emit(parse_node, AddrOnNonSelfParameter);
+    context.emitter().Emit(parse_node, AddrOnNonSelfParam);
   }
   return true;
 }
@@ -40,16 +40,15 @@ auto HandlePatternBinding(Context& context, Parse::Node parse_node) -> bool {
           context.node_stack()
               .PopForSoloParseNodeIf<Parse::NodeKind::SelfValueName>()) {
     if (context.parse_tree().node_kind(context.node_stack().PeekParseNode()) !=
-        Parse::NodeKind::ImplicitParameterListStart) {
+        Parse::NodeKind::ImplicitParamListStart) {
       CARBON_DIAGNOSTIC(
-          SelfOutsideImplicitParameterList, Error,
+          SelfOutsideImplicitParamList, Error,
           "`self` can only be declared in an implicit parameter list.");
-      context.emitter().Emit(parse_node, SelfOutsideImplicitParameterList);
+      context.emitter().Emit(parse_node, SelfOutsideImplicitParamList);
     }
     context.AddInstAndPush(
-        parse_node,
-        SemIR::SelfParameter{*self_node, cast_type_id,
-                             /*is_addr_self=*/SemIR::BoolValue::False});
+        parse_node, SemIR::SelfParam{*self_node, cast_type_id,
+                                     /*is_addr_self=*/SemIR::BoolValue::False});
     return true;
   }
 
@@ -115,12 +114,12 @@ auto HandlePatternBinding(Context& context, Parse::Node parse_node) -> bool {
       break;
     }
 
-    case Parse::NodeKind::ImplicitParameterListStart:
-    case Parse::NodeKind::ParameterListStart:
+    case Parse::NodeKind::ImplicitParamListStart:
+    case Parse::NodeKind::ParamListStart:
       // Parameters can have incomplete types in a function declaration, but not
       // in a function definition. We don't know which kind we have here.
-      context.AddInstAndPush(
-          parse_node, SemIR::Parameter{name_node, cast_type_id, name_id});
+      context.AddInstAndPush(parse_node,
+                             SemIR::Param{name_node, cast_type_id, name_id});
       // TODO: Create a `BindName` instruction.
       break;
 

toolchain/check/node_stack.h

@@ -317,8 +317,8 @@ class NodeStack {
         return IdKind::InstId;
       case Parse::NodeKind::IfCondition:
       case Parse::NodeKind::IfExprIf:
-      case Parse::NodeKind::ImplicitParameterList:
-      case Parse::NodeKind::ParameterList:
+      case Parse::NodeKind::ImplicitParamList:
+      case Parse::NodeKind::ParamList:
       case Parse::NodeKind::WhileCondition:
       case Parse::NodeKind::WhileConditionStart:
         return IdKind::InstBlockId;
@@ -333,9 +333,9 @@ class NodeStack {
       case Parse::NodeKind::CodeBlockStart:
       case Parse::NodeKind::FunctionIntroducer:
       case Parse::NodeKind::IfStatementElse:
-      case Parse::NodeKind::ImplicitParameterListStart:
+      case Parse::NodeKind::ImplicitParamListStart:
       case Parse::NodeKind::LetIntroducer:
-      case Parse::NodeKind::ParameterListStart:
+      case Parse::NodeKind::ParamListStart:
       case Parse::NodeKind::ParenExprOrTupleLiteralStart:
       case Parse::NodeKind::QualifiedDecl:
       case Parse::NodeKind::ReturnedSpecifier:

toolchain/check/testdata/basics/raw_and_textual_ir.carbon

@@ -34,7 +34,7 @@ fn Foo(n: i32) -> (i32, f64) {
 // CHECK:STDOUT:       0:               type0
 // CHECK:STDOUT:       1:               type2
 // CHECK:STDOUT:   insts:
-// CHECK:STDOUT:     inst+0:          {kind: Parameter, arg0: name1, type: type0}
+// CHECK:STDOUT:     inst+0:          {kind: Param, arg0: name1, type: type0}
 // CHECK:STDOUT:     inst+1:          {kind: TupleType, arg0: typeBlock0, type: typeTypeType}
 // CHECK:STDOUT:     inst+2:          {kind: TupleLiteral, arg0: block2, type: type1}
 // CHECK:STDOUT:     inst+3:          {kind: TupleType, arg0: typeBlock1, type: typeTypeType}

toolchain/check/testdata/basics/raw_ir.carbon

@@ -34,7 +34,7 @@ fn Foo(n: i32) -> (i32, f64) {
 // CHECK:STDOUT:       0:               type0
 // CHECK:STDOUT:       1:               type2
 // CHECK:STDOUT:   insts:
-// CHECK:STDOUT:     inst+0:          {kind: Parameter, arg0: name1, type: type0}
+// CHECK:STDOUT:     inst+0:          {kind: Param, arg0: name1, type: type0}
 // CHECK:STDOUT:     inst+1:          {kind: TupleType, arg0: typeBlock0, type: typeTypeType}
 // CHECK:STDOUT:     inst+2:          {kind: TupleLiteral, arg0: block2, type: type1}
 // CHECK:STDOUT:     inst+3:          {kind: TupleType, arg0: typeBlock1, type: typeTypeType}

toolchain/check/testdata/class/fail_self.carbon

@@ -90,7 +90,7 @@ fn CallWrongSelf(ws: WrongSelf) {
 // CHECK:STDOUT: fn @G() -> %return: Class {
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   %Class.ref: type = name_reference Class, file.%Class
-// CHECK:STDOUT:   %self: Class = self_parameter false
+// CHECK:STDOUT:   %self: Class = self_param false
 // CHECK:STDOUT:   %self.ref: <error> = name_reference self, <error>
 // CHECK:STDOUT:   return <error>
 // CHECK:STDOUT: }

toolchain/check/testdata/pointer/fail_address_of_value.carbon

@@ -75,7 +75,7 @@ fn AddressOfTupleElementValue() {
   &((1, 2)[0]);
 }
 
-fn AddressOfParameter(param: i32) {
+fn AddressOfParam(param: i32) {
   // CHECK:STDERR: fail_address_of_value.carbon:[[@LINE+3]]:26: ERROR: Cannot take the address of non-reference expression.
   // CHECK:STDERR:   var param_addr: i32* = &param;
   // CHECK:STDERR:                          ^
@@ -101,7 +101,7 @@ fn AddressOfParameter(param: i32) {
 // CHECK:STDOUT:   %AddressOfCall: <function> = fn_decl @AddressOfCall
 // CHECK:STDOUT:   %AddressOfType: <function> = fn_decl @AddressOfType
 // CHECK:STDOUT:   %AddressOfTupleElementValue: <function> = fn_decl @AddressOfTupleElementValue
-// CHECK:STDOUT:   %AddressOfParameter: <function> = fn_decl @AddressOfParameter
+// CHECK:STDOUT:   %AddressOfParam: <function> = fn_decl @AddressOfParam
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @G() -> i32;
@@ -176,7 +176,7 @@ fn AddressOfParameter(param: i32) {
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: fn @AddressOfParameter(%param: i32) {
+// CHECK:STDOUT: fn @AddressOfParam(%param: i32) {
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   %.loc82_22: type = ptr_type i32
 // CHECK:STDOUT:   %param_addr.var: ref i32* = var param_addr

toolchain/diagnostics/diagnostic_kind.def

@@ -65,7 +65,7 @@ CARBON_DIAGNOSTIC_KIND(ExpectedCodeBlock)
 CARBON_DIAGNOSTIC_KIND(ExpectedExpr)
 CARBON_DIAGNOSTIC_KIND(ExpectedIdentifierAfterDotOrArrow)
 CARBON_DIAGNOSTIC_KIND(ExpectedLetBindingName)
-CARBON_DIAGNOSTIC_KIND(ExpectedParameterName)
+CARBON_DIAGNOSTIC_KIND(ExpectedParamName)
 CARBON_DIAGNOSTIC_KIND(ExpectedParenAfter)
 CARBON_DIAGNOSTIC_KIND(ExpectedExprSemi)
 CARBON_DIAGNOSTIC_KIND(ExpectedStatementSemi)
@@ -105,8 +105,8 @@ CARBON_DIAGNOSTIC_KIND(ExpectedDeclSemi)
 CARBON_DIAGNOSTIC_KIND(ExpectedDeclSemiOrDefinition)
 CARBON_DIAGNOSTIC_KIND(ExpectedInitializerAfterLet)
 CARBON_DIAGNOSTIC_KIND(MethodImplNotAllowed)
-CARBON_DIAGNOSTIC_KIND(ParametersRequiredAfterImplicit)
-CARBON_DIAGNOSTIC_KIND(ParametersRequiredByIntroducer)
+CARBON_DIAGNOSTIC_KIND(ParamsRequiredAfterImplicit)
+CARBON_DIAGNOSTIC_KIND(ParamsRequiredByIntroducer)
 
 // ============================================================================
 // Semantics diagnostics
@@ -125,7 +125,7 @@ CARBON_DIAGNOSTIC_KIND(MissingObjectInMethodCall)
 
 CARBON_DIAGNOSTIC_KIND(AddressOfEphemeralReference)
 CARBON_DIAGNOSTIC_KIND(AddressOfNonReference)
-CARBON_DIAGNOSTIC_KIND(AddrOnNonSelfParameter)
+CARBON_DIAGNOSTIC_KIND(AddrOnNonSelfParam)
 CARBON_DIAGNOSTIC_KIND(ArrayInitFromLiteralArgCountMismatch)
 CARBON_DIAGNOSTIC_KIND(ArrayInitFromExprArgCountMismatch)
 CARBON_DIAGNOSTIC_KIND(AssignmentToNonAssignable)
@@ -157,7 +157,7 @@ CARBON_DIAGNOSTIC_KIND(InvalidArrayExpr)
 CARBON_DIAGNOSTIC_KIND(TypeNotIndexable)
 CARBON_DIAGNOSTIC_KIND(IndexOutOfBounds)
 CARBON_DIAGNOSTIC_KIND(InvalidMainRunSignature)
-CARBON_DIAGNOSTIC_KIND(SelfOutsideImplicitParameterList)
+CARBON_DIAGNOSTIC_KIND(SelfOutsideImplicitParamList)
 CARBON_DIAGNOSTIC_KIND(StructInitElementCountMismatch)
 CARBON_DIAGNOSTIC_KIND(StructInitMissingFieldInLiteral)
 CARBON_DIAGNOSTIC_KIND(StructInitMissingFieldInConversion)

toolchain/lower/file_context.cpp

@@ -159,10 +159,10 @@ auto FileContext::BuildFunctionDecl(SemIR::FunctionId function_id)
       name_id = SemIR::NameId::ReturnSlot;
       arg.addAttr(llvm::Attribute::getWithStructRetType(
           llvm_context(), GetType(function.return_type_id)));
-    } else if (inst.Is<SemIR::SelfParameter>()) {
+    } else if (inst.Is<SemIR::SelfParam>()) {
       name_id = SemIR::NameId::SelfValue;
     } else {
-      name_id = inst.As<SemIR::Parameter>().name_id;
+      name_id = inst.As<SemIR::Param>().name_id;
     }
     arg.setName(sem_ir().names().GetIRBaseName(name_id));
   }

toolchain/lower/handle.cpp

@@ -225,8 +225,8 @@ auto HandleNoOp(FunctionContext& /*context*/, SemIR::InstId /*inst_id*/,
   // No action to take.
 }
 
-auto HandleParameter(FunctionContext& /*context*/, SemIR::InstId /*inst_id*/,
-                     SemIR::Parameter /*inst*/) -> void {
+auto HandleParam(FunctionContext& /*context*/, SemIR::InstId /*inst_id*/,
+                 SemIR::Param /*inst*/) -> void {
   CARBON_FATAL() << "Parameters should be lowered by `BuildFunctionDefinition`";
 }
 
@@ -265,9 +265,8 @@ auto HandleReturnExpr(FunctionContext& context, SemIR::InstId /*inst_id*/,
   }
 }
 
-auto HandleSelfParameter(FunctionContext& /*context*/,
-                         SemIR::InstId /*inst_id*/,
-                         SemIR::SelfParameter /*inst*/) -> void {
+auto HandleSelfParam(FunctionContext& /*context*/, SemIR::InstId /*inst_id*/,
+                     SemIR::SelfParam /*inst*/) -> void {
   CARBON_FATAL() << "Parameters should be lowered by `BuildFunctionDefinition`";
 }
 

toolchain/parse/context.h

@@ -29,12 +29,7 @@ class Context {
   enum class ListTokenKind : int8_t { Comma, Close, CommaClose };
 
   // Supported kinds for HandlePattern.
-  enum class PatternKind : int8_t {
-    ImplicitParameter,
-    Parameter,
-    Variable,
-    Let
-  };
+  enum class PatternKind : int8_t { ImplicitParam, Param, Variable, Let };
 
   // Supported return values for GetDeclContext.
   enum class DeclContext : int8_t {

toolchain/parse/handle_brace_expr.cpp

@@ -16,18 +16,17 @@ auto HandleBraceExpr(Context& context) -> void {
       Lex::TokenKind::OpenCurlyBrace,
       NodeKind::StructLiteralOrStructTypeLiteralStart));
   if (!context.PositionIs(Lex::TokenKind::CloseCurlyBrace)) {
-    context.PushState(State::BraceExprParameterAsUnknown);
+    context.PushState(State::BraceExprParamAsUnknown);
   }
 }
 
 // Prints a diagnostic for brace expression syntax errors.
-static auto HandleBraceExprParameterError(Context& context,
-                                          Context::StateStackEntry state,
-                                          State param_finish_state) -> void {
-  bool is_type = param_finish_state == State::BraceExprParameterFinishAsType;
-  bool is_value = param_finish_state == State::BraceExprParameterFinishAsValue;
-  bool is_unknown =
-      param_finish_state == State::BraceExprParameterFinishAsUnknown;
+static auto HandleBraceExprParamError(Context& context,
+                                      Context::StateStackEntry state,
+                                      State param_finish_state) -> void {
+  bool is_type = param_finish_state == State::BraceExprParamFinishAsType;
+  bool is_value = param_finish_state == State::BraceExprParamFinishAsValue;
+  bool is_unknown = param_finish_state == State::BraceExprParamFinishAsUnknown;
   CARBON_CHECK(is_type || is_value || is_unknown);
   CARBON_DIAGNOSTIC(ExpectedStructLiteralField, Error, "Expected {0}{1}{2}.",
                     llvm::StringRef, llvm::StringRef, llvm::StringRef);
@@ -41,14 +40,13 @@ static auto HandleBraceExprParameterError(Context& context,
   context.PushState(state);
 }
 
-// Handles BraceExprParameterAs(Type|Value|Unknown).
-static auto HandleBraceExprParameter(Context& context,
-                                     State after_designator_state,
-                                     State param_finish_state) -> void {
+// Handles BraceExprParamAs(Type|Value|Unknown).
+static auto HandleBraceExprParam(Context& context, State after_designator_state,
+                                 State param_finish_state) -> void {
   auto state = context.PopState();
 
   if (!context.PositionIs(Lex::TokenKind::Period)) {
-    HandleBraceExprParameterError(context, state, param_finish_state);
+    HandleBraceExprParamError(context, state, param_finish_state);
     return;
   }
 
@@ -57,27 +55,24 @@ static auto HandleBraceExprParameter(Context& context,
   context.PushState(State::PeriodAsStruct);
 }
 
-auto HandleBraceExprParameterAsType(Context& context) -> void {
-  HandleBraceExprParameter(context,
-                           State::BraceExprParameterAfterDesignatorAsType,
-                           State::BraceExprParameterFinishAsType);
+auto HandleBraceExprParamAsType(Context& context) -> void {
+  HandleBraceExprParam(context, State::BraceExprParamAfterDesignatorAsType,
+                       State::BraceExprParamFinishAsType);
 }
 
-auto HandleBraceExprParameterAsValue(Context& context) -> void {
-  HandleBraceExprParameter(context,
-                           State::BraceExprParameterAfterDesignatorAsValue,
-                           State::BraceExprParameterFinishAsValue);
+auto HandleBraceExprParamAsValue(Context& context) -> void {
+  HandleBraceExprParam(context, State::BraceExprParamAfterDesignatorAsValue,
+                       State::BraceExprParamFinishAsValue);
 }
 
-auto HandleBraceExprParameterAsUnknown(Context& context) -> void {
-  HandleBraceExprParameter(context,
-                           State::BraceExprParameterAfterDesignatorAsUnknown,
-                           State::BraceExprParameterFinishAsUnknown);
+auto HandleBraceExprParamAsUnknown(Context& context) -> void {
+  HandleBraceExprParam(context, State::BraceExprParamAfterDesignatorAsUnknown,
+                       State::BraceExprParamFinishAsUnknown);
 }
 
-// Handles BraceExprParameterAfterDesignatorAs(Type|Value|Unknown).
-static auto HandleBraceExprParameterAfterDesignator(Context& context,
-                                                    State param_finish_state)
+// Handles BraceExprParamAfterDesignatorAs(Type|Value|Unknown).
+static auto HandleBraceExprParamAfterDesignator(Context& context,
+                                                State param_finish_state)
     -> void {
   auto state = context.PopState();
 
@@ -100,29 +95,28 @@ static auto HandleBraceExprParameterAfterDesignator(Context& context,
   } else if (context.PositionIs(Lex::TokenKind::Equal)) {
     is_type = false;
   } else {
-    HandleBraceExprParameterError(context, state, param_finish_state);
+    HandleBraceExprParamError(context, state, param_finish_state);
     return;
   }
 
   // If we're changing from unknown, update the related finish states.
-  if (param_finish_state == State::BraceExprParameterFinishAsUnknown) {
+  if (param_finish_state == State::BraceExprParamFinishAsUnknown) {
     auto finish_state = context.PopState();
     CARBON_CHECK(finish_state.state == State::BraceExprFinishAsUnknown);
     if (is_type) {
       finish_state.state = State::BraceExprFinishAsType;
-      param_finish_state = State::BraceExprParameterFinishAsType;
+      param_finish_state = State::BraceExprParamFinishAsType;
     } else {
       finish_state.state = State::BraceExprFinishAsValue;
-      param_finish_state = State::BraceExprParameterFinishAsValue;
+      param_finish_state = State::BraceExprParamFinishAsValue;
     }
     context.PushState(finish_state);
   }
 
-  auto want_param_finish_state = is_type
-                                     ? State::BraceExprParameterFinishAsType
-                                     : State::BraceExprParameterFinishAsValue;
+  auto want_param_finish_state = is_type ? State::BraceExprParamFinishAsType
+                                         : State::BraceExprParamFinishAsValue;
   if (param_finish_state != want_param_finish_state) {
-    HandleBraceExprParameterError(context, state, param_finish_state);
+    HandleBraceExprParamError(context, state, param_finish_state);
     return;
   }
 
@@ -134,25 +128,24 @@ static auto HandleBraceExprParameterAfterDesignator(Context& context,
   context.PushState(State::Expr);
 }
 
-auto HandleBraceExprParameterAfterDesignatorAsType(Context& context) -> void {
-  HandleBraceExprParameterAfterDesignator(
-      context, State::BraceExprParameterFinishAsType);
+auto HandleBraceExprParamAfterDesignatorAsType(Context& context) -> void {
+  HandleBraceExprParamAfterDesignator(context,
+                                      State::BraceExprParamFinishAsType);
 }
 
-auto HandleBraceExprParameterAfterDesignatorAsValue(Context& context) -> void {
-  HandleBraceExprParameterAfterDesignator(
-      context, State::BraceExprParameterFinishAsValue);
+auto HandleBraceExprParamAfterDesignatorAsValue(Context& context) -> void {
+  HandleBraceExprParamAfterDesignator(context,
+                                      State::BraceExprParamFinishAsValue);
 }
 
-auto HandleBraceExprParameterAfterDesignatorAsUnknown(Context& context)
-    -> void {
-  HandleBraceExprParameterAfterDesignator(
-      context, State::BraceExprParameterFinishAsUnknown);
+auto HandleBraceExprParamAfterDesignatorAsUnknown(Context& context) -> void {
+  HandleBraceExprParamAfterDesignator(context,
+                                      State::BraceExprParamFinishAsUnknown);
 }
 
-// Handles BraceExprParameterFinishAs(Type|Value|Unknown).
-static auto HandleBraceExprParameterFinish(Context& context, NodeKind node_kind,
-                                           State param_state) -> void {
+// Handles BraceExprParamFinishAs(Type|Value|Unknown).
+static auto HandleBraceExprParamFinish(Context& context, NodeKind node_kind,
+                                       State param_state) -> void {
   auto state = context.PopState();
 
   if (state.has_error) {
@@ -170,19 +163,19 @@ static auto HandleBraceExprParameterFinish(Context& context, NodeKind node_kind,
   }
 }
 
-auto HandleBraceExprParameterFinishAsType(Context& context) -> void {
-  HandleBraceExprParameterFinish(context, NodeKind::StructFieldType,
-                                 State::BraceExprParameterAsType);
+auto HandleBraceExprParamFinishAsType(Context& context) -> void {
+  HandleBraceExprParamFinish(context, NodeKind::StructFieldType,
+                             State::BraceExprParamAsType);
 }
 
-auto HandleBraceExprParameterFinishAsValue(Context& context) -> void {
-  HandleBraceExprParameterFinish(context, NodeKind::StructFieldValue,
-                                 State::BraceExprParameterAsValue);
+auto HandleBraceExprParamFinishAsValue(Context& context) -> void {
+  HandleBraceExprParamFinish(context, NodeKind::StructFieldValue,
+                             State::BraceExprParamAsValue);
 }
 
-auto HandleBraceExprParameterFinishAsUnknown(Context& context) -> void {
-  HandleBraceExprParameterFinish(context, NodeKind::StructFieldUnknown,
-                                 State::BraceExprParameterAsUnknown);
+auto HandleBraceExprParamFinishAsUnknown(Context& context) -> void {
+  HandleBraceExprParamFinish(context, NodeKind::StructFieldUnknown,
+                             State::BraceExprParamAsUnknown);
 }
 
 // Handles BraceExprFinishAs(Type|Value|Unknown).

toolchain/parse/handle_call_expr.cpp

@@ -15,12 +15,12 @@ auto HandleCallExpr(Context& context) -> void {
   context.AddNode(NodeKind::CallExprStart, context.Consume(),
                   state.subtree_start, state.has_error);
   if (!context.PositionIs(Lex::TokenKind::CloseParen)) {
-    context.PushState(State::CallExprParameterFinish);
+    context.PushState(State::CallExprParamFinish);
     context.PushState(State::Expr);
   }
 }
 
-auto HandleCallExprParameterFinish(Context& context) -> void {
+auto HandleCallExprParamFinish(Context& context) -> void {
   auto state = context.PopState();
 
   if (state.has_error) {
@@ -30,7 +30,7 @@ auto HandleCallExprParameterFinish(Context& context) -> void {
   if (context.ConsumeListToken(NodeKind::CallExprComma,
                                Lex::TokenKind::CloseParen, state.has_error) ==
       Context::ListTokenKind::Comma) {
-    context.PushState(State::CallExprParameterFinish);
+    context.PushState(State::CallExprParamFinish);
     context.PushState(State::Expr);
   }
 }

toolchain/parse/handle_decl_name_and_params.cpp

@@ -80,13 +80,13 @@ static auto HandleDeclNameAndParamsAfterName(Context& context, Params params)
 
   if (context.PositionIs(Lex::TokenKind::OpenSquareBracket)) {
     context.PushState(State::DeclNameAndParamsAfterImplicit);
-    context.PushState(State::ParameterListAsImplicit);
+    context.PushState(State::ParamListAsImplicit);
   } else if (context.PositionIs(Lex::TokenKind::OpenParen)) {
-    context.PushState(State::ParameterListAsRegular);
+    context.PushState(State::ParamListAsRegular);
   } else if (params == Params::Required) {
-    CARBON_DIAGNOSTIC(ParametersRequiredByIntroducer, Error,
+    CARBON_DIAGNOSTIC(ParamsRequiredByIntroducer, Error,
                       "`{0}` requires a `(` for parameters.", Lex::TokenKind);
-    context.emitter().Emit(*context.position(), ParametersRequiredByIntroducer,
+    context.emitter().Emit(*context.position(), ParamsRequiredByIntroducer,
                            context.tokens().GetKind(state.token));
     context.ReturnErrorOnState();
   }
@@ -108,13 +108,12 @@ auto HandleDeclNameAndParamsAfterImplicit(Context& context) -> void {
   context.PopAndDiscardState();
 
   if (context.PositionIs(Lex::TokenKind::OpenParen)) {
-    context.PushState(State::ParameterListAsRegular);
+    context.PushState(State::ParamListAsRegular);
   } else {
     CARBON_DIAGNOSTIC(
-        ParametersRequiredAfterImplicit, Error,
+        ParamsRequiredAfterImplicit, Error,
         "A `(` for parameters is required after implicit parameters.");
-    context.emitter().Emit(*context.position(),
-                           ParametersRequiredAfterImplicit);
+    context.emitter().Emit(*context.position(), ParamsRequiredAfterImplicit);
     context.ReturnErrorOnState();
   }
 }

toolchain/parse/handle_function.cpp

@@ -11,12 +11,12 @@ auto HandleFunctionIntroducer(Context& context) -> void {
 
   context.AddLeafNode(NodeKind::FunctionIntroducer, context.Consume());
 
-  state.state = State::FunctionAfterParameters;
+  state.state = State::FunctionAfterParams;
   context.PushState(state);
   context.PushState(State::DeclNameAndParamsAsRequired, state.token);
 }
 
-auto HandleFunctionAfterParameters(Context& context) -> void {
+auto HandleFunctionAfterParams(Context& context) -> void {
   auto state = context.PopState();
 
   // Regardless of whether there's a return type, we'll finish the signature.

toolchain/parse/handle_parameter.cpp

@@ -6,56 +6,54 @@
 
 namespace Carbon::Parse {
 
-// Handles ParameterAs(Implicit|Regular).
-static auto HandleParameter(Context& context, State pattern_state,
-                            State finish_state) -> void {
+// Handles ParamAs(Implicit|Regular).
+static auto HandleParam(Context& context, State pattern_state,
+                        State finish_state) -> void {
   context.PopAndDiscardState();
 
   context.PushState(finish_state);
   context.PushState(pattern_state);
 }
 
-auto HandleParameterAsImplicit(Context& context) -> void {
-  HandleParameter(context, State::PatternAsImplicitParameter,
-                  State::ParameterFinishAsImplicit);
+auto HandleParamAsImplicit(Context& context) -> void {
+  HandleParam(context, State::PatternAsImplicitParam,
+              State::ParamFinishAsImplicit);
 }
 
-auto HandleParameterAsRegular(Context& context) -> void {
-  HandleParameter(context, State::PatternAsParameter,
-                  State::ParameterFinishAsRegular);
+auto HandleParamAsRegular(Context& context) -> void {
+  HandleParam(context, State::PatternAsParam, State::ParamFinishAsRegular);
 }
 
-// Handles ParameterFinishAs(Implicit|Regular).
-static auto HandleParameterFinish(Context& context, Lex::TokenKind close_token,
-                                  State param_state) -> void {
+// Handles ParamFinishAs(Implicit|Regular).
+static auto HandleParamFinish(Context& context, Lex::TokenKind close_token,
+                              State param_state) -> void {
   auto state = context.PopState();
 
   if (state.has_error) {
     context.ReturnErrorOnState();
   }
 
-  if (context.ConsumeListToken(NodeKind::ParameterListComma, close_token,
+  if (context.ConsumeListToken(NodeKind::ParamListComma, close_token,
                                state.has_error) ==
       Context::ListTokenKind::Comma) {
     context.PushState(param_state);
   }
 }
 
-auto HandleParameterFinishAsImplicit(Context& context) -> void {
-  HandleParameterFinish(context, Lex::TokenKind::CloseSquareBracket,
-                        State::ParameterAsImplicit);
+auto HandleParamFinishAsImplicit(Context& context) -> void {
+  HandleParamFinish(context, Lex::TokenKind::CloseSquareBracket,
+                    State::ParamAsImplicit);
 }
 
-auto HandleParameterFinishAsRegular(Context& context) -> void {
-  HandleParameterFinish(context, Lex::TokenKind::CloseParen,
-                        State::ParameterAsRegular);
+auto HandleParamFinishAsRegular(Context& context) -> void {
+  HandleParamFinish(context, Lex::TokenKind::CloseParen, State::ParamAsRegular);
 }
 
-// Handles ParameterListAs(Implicit|Regular).
-static auto HandleParameterList(Context& context, NodeKind parse_node_kind,
-                                Lex::TokenKind open_token_kind,
-                                Lex::TokenKind close_token_kind,
-                                State param_state, State finish_state) -> void {
+// Handles ParamListAs(Implicit|Regular).
+static auto HandleParamList(Context& context, NodeKind parse_node_kind,
+                            Lex::TokenKind open_token_kind,
+                            Lex::TokenKind close_token_kind, State param_state,
+                            State finish_state) -> void {
   context.PopAndDiscardState();
 
   context.PushState(finish_state);
@@ -66,38 +64,36 @@ static auto HandleParameterList(Context& context, NodeKind parse_node_kind,
   }
 }
 
-auto HandleParameterListAsImplicit(Context& context) -> void {
-  HandleParameterList(
-      context, NodeKind::ImplicitParameterListStart,
-      Lex::TokenKind::OpenSquareBracket, Lex::TokenKind::CloseSquareBracket,
-      State::ParameterAsImplicit, State::ParameterListFinishAsImplicit);
+auto HandleParamListAsImplicit(Context& context) -> void {
+  HandleParamList(context, NodeKind::ImplicitParamListStart,
+                  Lex::TokenKind::OpenSquareBracket,
+                  Lex::TokenKind::CloseSquareBracket, State::ParamAsImplicit,
+                  State::ParamListFinishAsImplicit);
 }
 
-auto HandleParameterListAsRegular(Context& context) -> void {
-  HandleParameterList(context, NodeKind::ParameterListStart,
-                      Lex::TokenKind::OpenParen, Lex::TokenKind::CloseParen,
-                      State::ParameterAsRegular,
-                      State::ParameterListFinishAsRegular);
+auto HandleParamListAsRegular(Context& context) -> void {
+  HandleParamList(context, NodeKind::ParamListStart, Lex::TokenKind::OpenParen,
+                  Lex::TokenKind::CloseParen, State::ParamAsRegular,
+                  State::ParamListFinishAsRegular);
 }
 
-// Handles ParameterListFinishAs(Implicit|Regular).
-static auto HandleParameterListFinish(Context& context,
-                                      NodeKind parse_node_kind,
-                                      Lex::TokenKind token_kind) -> void {
+// Handles ParamListFinishAs(Implicit|Regular).
+static auto HandleParamListFinish(Context& context, NodeKind parse_node_kind,
+                                  Lex::TokenKind token_kind) -> void {
   auto state = context.PopState();
 
   context.AddNode(parse_node_kind, context.ConsumeChecked(token_kind),
                   state.subtree_start, state.has_error);
 }
 
-auto HandleParameterListFinishAsImplicit(Context& context) -> void {
-  HandleParameterListFinish(context, NodeKind::ImplicitParameterList,
-                            Lex::TokenKind::CloseSquareBracket);
+auto HandleParamListFinishAsImplicit(Context& context) -> void {
+  HandleParamListFinish(context, NodeKind::ImplicitParamList,
+                        Lex::TokenKind::CloseSquareBracket);
 }
 
-auto HandleParameterListFinishAsRegular(Context& context) -> void {
-  HandleParameterListFinish(context, NodeKind::ParameterList,
-                            Lex::TokenKind::CloseParen);
+auto HandleParamListFinishAsRegular(Context& context) -> void {
+  HandleParamListFinish(context, NodeKind::ParamList,
+                        Lex::TokenKind::CloseParen);
 }
 
 }  // namespace Carbon::Parse

toolchain/parse/handle_paren_expr.cpp

@@ -19,13 +19,13 @@ auto HandleParenExpr(Context& context) -> void {
   } else {
     state.state = State::ParenExprFinishAsNormal;
     context.PushState(state);
-    context.PushState(State::ParenExprParameterFinishAsUnknown);
+    context.PushState(State::ParenExprParamFinishAsUnknown);
     context.PushState(State::Expr);
   }
 }
 
-// Handles ParenExprParameterFinishAs(Unknown|Tuple).
-static auto HandleParenExprParameterFinish(Context& context, bool as_tuple)
+// Handles ParenExprParamFinishAs(Unknown|Tuple).
+static auto HandleParenExprParamFinish(Context& context, bool as_tuple)
     -> void {
   auto state = context.PopState();
 
@@ -39,7 +39,7 @@ static auto HandleParenExprParameterFinish(Context& context, bool as_tuple)
   // Note this could be `(expr,)` so we may not reuse the current state, but
   // it's still necessary to switch the parent.
   if (!as_tuple) {
-    state.state = State::ParenExprParameterFinishAsTuple;
+    state.state = State::ParenExprParamFinishAsTuple;
 
     auto finish_state = context.PopState();
     CARBON_CHECK(finish_state.state == State::ParenExprFinishAsNormal)
@@ -55,12 +55,12 @@ static auto HandleParenExprParameterFinish(Context& context, bool as_tuple)
   }
 }
 
-auto HandleParenExprParameterFinishAsUnknown(Context& context) -> void {
-  HandleParenExprParameterFinish(context, /*as_tuple=*/false);
+auto HandleParenExprParamFinishAsUnknown(Context& context) -> void {
+  HandleParenExprParamFinish(context, /*as_tuple=*/false);
 }
 
-auto HandleParenExprParameterFinishAsTuple(Context& context) -> void {
-  HandleParenExprParameterFinish(context, /*as_tuple=*/true);
+auto HandleParenExprParamFinishAsTuple(Context& context) -> void {
+  HandleParenExprParamFinish(context, /*as_tuple=*/true);
 }
 
 auto HandleParenExprFinishAsNormal(Context& context) -> void {

toolchain/parse/handle_pattern.cpp

@@ -6,7 +6,7 @@
 
 namespace Carbon::Parse {
 
-// Handles PatternAs(ImplicitParameter|FunctionParameter|Variable|Let).
+// Handles PatternAs(ImplicitParam|FunctionParam|Variable|Let).
 static auto HandlePattern(Context& context, Context::PatternKind pattern_kind)
     -> void {
   auto state = context.PopState();
@@ -23,11 +23,11 @@ static auto HandlePattern(Context& context, Context::PatternKind pattern_kind)
   // Handle an invalid pattern introducer for parameters and variables.
   auto on_error = [&]() {
     switch (pattern_kind) {
-      case Context::PatternKind::ImplicitParameter:
-      case Context::PatternKind::Parameter: {
-        CARBON_DIAGNOSTIC(ExpectedParameterName, Error,
+      case Context::PatternKind::ImplicitParam:
+      case Context::PatternKind::Param: {
+        CARBON_DIAGNOSTIC(ExpectedParamName, Error,
                           "Expected parameter declaration.");
-        context.emitter().Emit(*context.position(), ExpectedParameterName);
+        context.emitter().Emit(*context.position(), ExpectedParamName);
         break;
       }
       case Context::PatternKind::Variable: {
@@ -85,12 +85,12 @@ static auto HandlePattern(Context& context, Context::PatternKind pattern_kind)
   }
 }
 
-auto HandlePatternAsImplicitParameter(Context& context) -> void {
-  HandlePattern(context, Context::PatternKind::ImplicitParameter);
+auto HandlePatternAsImplicitParam(Context& context) -> void {
+  HandlePattern(context, Context::PatternKind::ImplicitParam);
 }
 
-auto HandlePatternAsParameter(Context& context) -> void {
-  HandlePattern(context, Context::PatternKind::Parameter);
+auto HandlePatternAsParam(Context& context) -> void {
+  HandlePattern(context, Context::PatternKind::Param);
 }
 
 auto HandlePatternAsVariable(Context& context) -> void {

toolchain/parse/node_kind.def

@@ -144,7 +144,7 @@ CARBON_PARSE_NODE_KIND_BRACKET(CodeBlock, CodeBlockStart,
 // `fn`:
 //     FunctionIntroducer
 //     _external_: Name or QualifiedDecl
-//     _external_: ParameterList
+//     _external_: ParamList
 //       _external_: type expression
 //     ReturnType
 //   FunctionDefinitionStart
@@ -167,20 +167,20 @@ CARBON_PARSE_NODE_KIND_BRACKET(FunctionDecl, FunctionIntroducer,
 // A parameter list, possibly implicit:
 //   [Implicit]ParamertListStart
 //   _external_: [Generic]PatternBinding
-//   ParameterListComma
-// [Implicit]ParameterList
+//   ParamListComma
+// [Implicit]ParamList
 //
-// Exprs and ParameterListComma may repeat with ParameterListComma as a
+// Exprs and ParamListComma may repeat with ParamListComma as a
 // separator.
-CARBON_PARSE_NODE_KIND_CHILD_COUNT(ParameterListStart, 0,
+CARBON_PARSE_NODE_KIND_CHILD_COUNT(ParamListStart, 0,
                                    CARBON_TOKEN(OpenParen))
-CARBON_PARSE_NODE_KIND_CHILD_COUNT(ImplicitParameterListStart, 0,
+CARBON_PARSE_NODE_KIND_CHILD_COUNT(ImplicitParamListStart, 0,
                                    CARBON_TOKEN(OpenSquareBracket))
-CARBON_PARSE_NODE_KIND_CHILD_COUNT(ParameterListComma, 0, CARBON_TOKEN(Comma))
-CARBON_PARSE_NODE_KIND_BRACKET(ParameterList, ParameterListStart,
+CARBON_PARSE_NODE_KIND_CHILD_COUNT(ParamListComma, 0, CARBON_TOKEN(Comma))
+CARBON_PARSE_NODE_KIND_BRACKET(ParamList, ParamListStart,
                                CARBON_TOKEN(CloseParen))
-CARBON_PARSE_NODE_KIND_BRACKET(ImplicitParameterList,
-                               ImplicitParameterListStart,
+CARBON_PARSE_NODE_KIND_BRACKET(ImplicitParamList,
+                               ImplicitParamListStart,
                                CARBON_TOKEN(CloseSquareBracket))
 
 // An array type, such as  `[i32; 3]` or `[i32;]`:

toolchain/parse/state.def

@@ -105,7 +105,7 @@ CARBON_PARSE_STATE(ArrayExprFinish)
 //
 // { ... }
 // ^
-//   1. BraceExprParameterAsUnknown
+//   1. BraceExprParamAsUnknown
 //   2. BraceExprFinishAsUnknown
 CARBON_PARSE_STATE(BraceExpr)
 
@@ -116,12 +116,12 @@ CARBON_PARSE_STATE(BraceExpr)
 // { .foo ... }
 //  ^
 //   1. PeriodAsStruct
-//   2. BraceExprParameterAfterDesignatorAs(Type|Value|Unknown)
+//   2. BraceExprParamAfterDesignatorAs(Type|Value|Unknown)
 //
 // { ???
 //  ^
-//   1. BraceExprParameterFinishAs(Type|Value|Unknown)
-CARBON_PARSE_STATE_VARIANTS3(BraceExprParameter, Type, Value, Unknown)
+//   1. BraceExprParamFinishAs(Type|Value|Unknown)
+CARBON_PARSE_STATE_VARIANTS3(BraceExprParam, Type, Value, Unknown)
 
 // Handles a brace expression parameter after the initial designator. This
 // should be at a `:` or `=`, depending on whether it's a type or value literal.
@@ -129,17 +129,17 @@ CARBON_PARSE_STATE_VARIANTS3(BraceExprParameter, Type, Value, Unknown)
 // { .foo = bar ... }
 //        ^
 //   1. Expr
-//   2. BraceExprParameterFinishAsValue
+//   2. BraceExprParamFinishAsValue
 //
 // { .foo: bar ... }
 //       ^
 //   1. Expr
-//   2. BraceExprParameterFinishAsType
+//   2. BraceExprParamFinishAsType
 //
 // { .foo ???
 //       ^
-//   1. BraceExprParameterFinishAs(Type|Value|Unknown)
-CARBON_PARSE_STATE_VARIANTS3(BraceExprParameterAfterDesignator, Type, Value,
+//   1. BraceExprParamFinishAs(Type|Value|Unknown)
+CARBON_PARSE_STATE_VARIANTS3(BraceExprParamAfterDesignator, Type, Value,
                              Unknown)
 
 // Handles the end of a brace expression parameter.
@@ -150,16 +150,16 @@ CARBON_PARSE_STATE_VARIANTS3(BraceExprParameterAfterDesignator, Type, Value,
 //
 // { .foo = bar, ... }
 //             ^
-//   1. BraceExprParameterAsValue
+//   1. BraceExprParamAsValue
 //
 // { .foo: bar, ... }
 //            ^
-//   1. BraceExprParameterAsType
+//   1. BraceExprParamAsType
 //
 // { ??? , ... }
 //       ^
-//   1. BraceExprParameterAsUnknown
-CARBON_PARSE_STATE_VARIANTS3(BraceExprParameterFinish, Type, Value, Unknown)
+//   1. BraceExprParamAsUnknown
+CARBON_PARSE_STATE_VARIANTS3(BraceExprParamFinish, Type, Value, Unknown)
 
 // Handles the `}` of a brace expression.
 //
@@ -177,7 +177,7 @@ CARBON_PARSE_STATE_VARIANTS3(BraceExprFinish, Type, Value, Unknown)
 // F( ...
 //  ^
 //   1. Expr
-//   2. CallExprParameterFinish
+//   2. CallExprParamFinish
 //   3. CallExprFinish
 CARBON_PARSE_STATE(CallExpr)
 
@@ -186,12 +186,12 @@ CARBON_PARSE_STATE(CallExpr)
 // F(a, ...)
 //    ^
 //   1. Expr
-//   2. CallExprParameterFinish
+//   2. CallExprParamFinish
 //
 // F(a )
 //    ^
 //   (state done)
-CARBON_PARSE_STATE(CallExprParameterFinish)
+CARBON_PARSE_STATE(CallExprParamFinish)
 
 // Handles finishing the call expression.
 //
@@ -251,12 +251,12 @@ CARBON_PARSE_STATE_VARIANTS3(DeclNameAndParams, None, Optional, Required)
 //
 // name [ ... ]    (variant is not None)
 //     ^
-//   1. ParameterListAsImplicit
+//   1. ParamListAsImplicit
 //   2. DeclNameAndParamsAfterImplicit
 //
 // name ( ... )    (variant is not None)
 //     ^
-//   1. ParameterListAsRegular
+//   1. ParamListAsRegular
 //
 // name ...        (variant is not Required)
 //     ^
@@ -273,7 +273,7 @@ CARBON_PARSE_STATE_VARIANTS3(DeclNameAndParamsAfterName, None, Optional,
 //
 // name [ ... ] ( ... )
 //             ^
-//   1. ParameterListAsRegular
+//   1. ParamListAsRegular
 //
 // name [ ... ] ???
 //             ^
@@ -527,7 +527,7 @@ CARBON_PARSE_STATE(ExprStatementFinish)
 // fn ...
 // ^~
 //   1. DeclNameAndParamsAsRequired
-//   2. FunctionAfterParameters
+//   2. FunctionAfterParams
 CARBON_PARSE_STATE(FunctionIntroducer)
 
 // Handles processing of a function's syntax after `)`, primarily the
@@ -543,7 +543,7 @@ CARBON_PARSE_STATE(FunctionIntroducer)
 // fn F(...) ...
 //          ^
 //   1. FunctionSignatureFinish
-CARBON_PARSE_STATE(FunctionAfterParameters)
+CARBON_PARSE_STATE(FunctionAfterParams)
 
 // Finishes a function return type.
 //
@@ -617,9 +617,9 @@ CARBON_PARSE_STATE(Package)
 //
 //  ...
 // ^
-//   1. PatternAs(ImplicitParameter|Parameter)
-//   2. ParameterFinishAs(Implicit|Regular)
-CARBON_PARSE_STATE_VARIANTS2(Parameter, Implicit, Regular)
+//   1. PatternAs(ImplicitParam|Param)
+//   2. ParamFinishAs(Implicit|Regular)
+CARBON_PARSE_STATE_VARIANTS2(Param, Implicit, Regular)
 
 // Finishes parsing a parameter, including the optional trailing `,`. If there
 // are more parameters, enqueues another parameter parsing state.
@@ -630,12 +630,12 @@ CARBON_PARSE_STATE_VARIANTS2(Parameter, Implicit, Regular)
 //
 // ... , ...
 //     ^
-//   1. ParameterAs(Implicit|Regular)
+//   1. ParamAs(Implicit|Regular)
 //
 // ...
 //    ^
 //   (state done)
-CARBON_PARSE_STATE_VARIANTS2(ParameterFinish, Implicit, Regular)
+CARBON_PARSE_STATE_VARIANTS2(ParamFinish, Implicit, Regular)
 
 // Handles processing of a parameter list `[` or `(`.
 //
@@ -643,15 +643,15 @@ CARBON_PARSE_STATE_VARIANTS2(ParameterFinish, Implicit, Regular)
 // ^
 // [ ]        (variant is Implicit)
 // ^
-//   1. ParameterListFinishAs(Regular|Implicit)
+//   1. ParamListFinishAs(Regular|Implicit)
 //
 // ( ... )    (variant is Regular)
 // ^
 // [ ... ]    (variant is Implicit)
 // ^
-//   1. ParameterAs(Regular|Implicit)
-//   2. ParameterListFinishAs(Regular|Implicit)
-CARBON_PARSE_STATE_VARIANTS2(ParameterList, Implicit, Regular)
+//   1. ParamAs(Regular|Implicit)
+//   2. ParamListFinishAs(Regular|Implicit)
+CARBON_PARSE_STATE_VARIANTS2(ParamList, Implicit, Regular)
 
 // Handles processing of a parameter list `]` or `)`.
 //
@@ -660,7 +660,7 @@ CARBON_PARSE_STATE_VARIANTS2(ParameterList, Implicit, Regular)
 // [ ... ]    (variant is Implicit)
 //       ^
 //   (state done)
-CARBON_PARSE_STATE_VARIANTS2(ParameterListFinish, Implicit, Regular)
+CARBON_PARSE_STATE_VARIANTS2(ParamListFinish, Implicit, Regular)
 
 // Handles the processing of a `(condition)` up through the expression.
 //
@@ -696,7 +696,7 @@ CARBON_PARSE_STATE_VARIANTS2(ParenConditionFinish, If, While)
 // ( ... )
 // ^
 //   1. Expr
-//   2. ParenExprParameterFinishAsUnknown
+//   2. ParenExprParamFinishAsUnknown
 //   3. ParenExprFinishAsNormal    (SPECIAL: may be replaced)
 CARBON_PARSE_STATE(ParenExpr)
 
@@ -712,13 +712,13 @@ CARBON_PARSE_STATE(ParenExpr)
 // ( ... , ... )
 //       ^
 //   1. Expression
-//   2. ParenExpressionParameterFinishAsTuple
+//   2. ParenExpressionParamFinishAsTuple
 //   SPECIAL (variant is Unknown): parent becomes ParenExprFinishAsTuple
 //
 //  ...
 // ^
 //   (state done)
-CARBON_PARSE_STATE_VARIANTS2(ParenExprParameterFinish, Unknown, Tuple)
+CARBON_PARSE_STATE_VARIANTS2(ParenExprParamFinish, Unknown, Tuple)
 
 // Handles the `)` of a parenthesized expression.
 //
@@ -759,7 +759,7 @@ CARBON_PARSE_STATE_VARIANTS2(ParenExprFinish, Normal, Tuple)
 //  ???
 // ^
 //   1. PatternFinishAsRegular
-CARBON_PARSE_STATE_VARIANTS4(Pattern, ImplicitParameter, Parameter, Variable,
+CARBON_PARSE_STATE_VARIANTS4(Pattern, ImplicitParam, Param, Variable,
                              Let)
 
 // Handles `addr` in a pattern.

toolchain/parse/testdata/basics/fail_invalid_designators.carbon

@@ -25,8 +25,8 @@ fn F() {
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'F'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
 // CHECK:STDOUT:           {kind: 'NameExpr', text: 'a'},
 // CHECK:STDOUT:           {kind: 'Name', text: ';', has_error: yes},

toolchain/parse/testdata/basics/function_call.carbon

@@ -14,8 +14,8 @@ fn F() {
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'F'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
 // CHECK:STDOUT:                       {kind: 'NameExpr', text: 'a'},
 // CHECK:STDOUT:                       {kind: 'Name', text: 'b'},

toolchain/parse/testdata/basics/multifile.carbon

@@ -15,8 +15,8 @@ fn B() {}
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'A'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
 // CHECK:STDOUT:     {kind: 'FunctionDefinition', text: '}', subtree_size: 6},
 // CHECK:STDOUT:     {kind: 'FileEnd', text: ''},
@@ -26,8 +26,8 @@ fn B() {}
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'B'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
 // CHECK:STDOUT:     {kind: 'FunctionDefinition', text: '}', subtree_size: 6},
 // CHECK:STDOUT:     {kind: 'FileEnd', text: ''},

toolchain/parse/testdata/basics/numeric_literals.carbon

@@ -30,8 +30,8 @@ fn F() {
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'F'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
 // CHECK:STDOUT:         {kind: 'VariableIntroducer', text: 'var'},
 // CHECK:STDOUT:           {kind: 'Name', text: 'ints'},

toolchain/parse/testdata/basics/parens.carbon

@@ -13,11 +13,11 @@ fn F(n: i32) -> i32 {
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'F'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
 // CHECK:STDOUT:             {kind: 'Name', text: 'n'},
 // CHECK:STDOUT:             {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 5},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 5},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'ReturnType', text: '->', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 10},

toolchain/parse/testdata/class/basic.carbon

@@ -16,8 +16,8 @@ class Foo {
 // CHECK:STDOUT:       {kind: 'ClassDefinitionStart', text: '{', subtree_size: 3},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'Baz'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDecl', text: ';', subtree_size: 5},
 // CHECK:STDOUT:     {kind: 'ClassDefinition', text: '}', subtree_size: 9},
 // CHECK:STDOUT:     {kind: 'FileEnd', text: ''},

toolchain/parse/testdata/class/fn_definitions.carbon

@@ -20,8 +20,8 @@ class Foo {
 // CHECK:STDOUT:       {kind: 'ClassDefinitionStart', text: '{', subtree_size: 3},
 // CHECK:STDOUT:           {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:           {kind: 'Name', text: 'Make'},
-// CHECK:STDOUT:             {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:           {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:             {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:           {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:             {kind: 'SelfTypeNameExpr', text: 'Self'},
 // CHECK:STDOUT:           {kind: 'ReturnType', text: '->', subtree_size: 2},
 // CHECK:STDOUT:         {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 7},
@@ -36,13 +36,13 @@ class Foo {
 // CHECK:STDOUT:       {kind: 'FunctionDefinition', text: '}', subtree_size: 16},
 // CHECK:STDOUT:           {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:           {kind: 'Name', text: 'Baz'},
-// CHECK:STDOUT:             {kind: 'ImplicitParameterListStart', text: '['},
+// CHECK:STDOUT:             {kind: 'ImplicitParamListStart', text: '['},
 // CHECK:STDOUT:               {kind: 'SelfValueName', text: 'self'},
 // CHECK:STDOUT:               {kind: 'SelfTypeNameExpr', text: 'Self'},
 // CHECK:STDOUT:             {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:           {kind: 'ImplicitParameterList', text: ']', subtree_size: 5},
-// CHECK:STDOUT:             {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:           {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ImplicitParamList', text: ']', subtree_size: 5},
+// CHECK:STDOUT:             {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:           {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:             {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:           {kind: 'ReturnType', text: '->', subtree_size: 2},
 // CHECK:STDOUT:         {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 12},
@@ -54,15 +54,15 @@ class Foo {
 // CHECK:STDOUT:       {kind: 'FunctionDefinition', text: '}', subtree_size: 18},
 // CHECK:STDOUT:           {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:           {kind: 'Name', text: 'Modify'},
-// CHECK:STDOUT:             {kind: 'ImplicitParameterListStart', text: '['},
+// CHECK:STDOUT:             {kind: 'ImplicitParamListStart', text: '['},
 // CHECK:STDOUT:                 {kind: 'SelfValueName', text: 'self'},
 // CHECK:STDOUT:                   {kind: 'SelfTypeNameExpr', text: 'Self'},
 // CHECK:STDOUT:                 {kind: 'PostfixOperator', text: '*', subtree_size: 2},
 // CHECK:STDOUT:               {kind: 'PatternBinding', text: ':', subtree_size: 4},
 // CHECK:STDOUT:             {kind: 'Address', text: 'addr', subtree_size: 5},
-// CHECK:STDOUT:           {kind: 'ImplicitParameterList', text: ']', subtree_size: 7},
-// CHECK:STDOUT:             {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:           {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ImplicitParamList', text: ']', subtree_size: 7},
+// CHECK:STDOUT:             {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:           {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:         {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 12},
 // CHECK:STDOUT:               {kind: 'SelfValueNameExpr', text: 'self'},
 // CHECK:STDOUT:               {kind: 'Name', text: 'x'},

toolchain/parse/testdata/for/fail_colon_instead_of_in.carbon

@@ -18,8 +18,8 @@ fn foo() {
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'foo'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
 // CHECK:STDOUT:           {kind: 'ForHeaderStart', text: '('},
 // CHECK:STDOUT:             {kind: 'VariableIntroducer', text: 'var'},

toolchain/parse/testdata/for/fail_missing_cond.carbon

@@ -26,8 +26,8 @@ fn F() {
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'F'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
 // CHECK:STDOUT:           {kind: 'ForHeaderStart', text: 'for', has_error: yes},
 // CHECK:STDOUT:             {kind: 'StructLiteralOrStructTypeLiteralStart', text: '{'},

toolchain/parse/testdata/for/fail_missing_in.carbon

@@ -18,8 +18,8 @@ fn foo() {
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'foo'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
 // CHECK:STDOUT:           {kind: 'ForHeaderStart', text: '('},
 // CHECK:STDOUT:             {kind: 'VariableIntroducer', text: 'var'},

toolchain/parse/testdata/for/fail_missing_var.carbon

@@ -18,8 +18,8 @@ fn foo() {
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'foo'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
 // CHECK:STDOUT:           {kind: 'ForHeaderStart', text: '('},
 // CHECK:STDOUT:           {kind: 'NameExpr', text: 'y'},

toolchain/parse/testdata/for/fail_returned_var.carbon

@@ -19,8 +19,8 @@ fn foo() -> i32 {
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'foo'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'ReturnType', text: '->', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 7},

toolchain/parse/testdata/for/fail_square_brackets.carbon

@@ -26,8 +26,8 @@ fn F() {
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'F'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
 // CHECK:STDOUT:           {kind: 'ForHeaderStart', text: 'for', has_error: yes},
 // CHECK:STDOUT:               {kind: 'ArrayExprStart', text: '['},

toolchain/parse/testdata/for/nested.carbon

@@ -17,8 +17,8 @@ fn foo() {
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'foo'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
 // CHECK:STDOUT:           {kind: 'ForHeaderStart', text: '('},
 // CHECK:STDOUT:             {kind: 'VariableIntroducer', text: 'var'},

toolchain/parse/testdata/for/simple.carbon

@@ -15,8 +15,8 @@ fn foo() {
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'foo'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
 // CHECK:STDOUT:           {kind: 'ForHeaderStart', text: '('},
 // CHECK:STDOUT:             {kind: 'VariableIntroducer', text: 'var'},

toolchain/parse/testdata/function/declaration/addr.carbon

@@ -11,13 +11,13 @@ fn foo(addr a: i32*);
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:       {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:       {kind: 'Name', text: 'foo'},
-// CHECK:STDOUT:         {kind: 'ParameterListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamListStart', text: '('},
 // CHECK:STDOUT:             {kind: 'Name', text: 'a'},
 // CHECK:STDOUT:               {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:             {kind: 'PostfixOperator', text: '*', subtree_size: 2},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 4},
 // CHECK:STDOUT:         {kind: 'Address', text: 'addr', subtree_size: 5},
-// CHECK:STDOUT:       {kind: 'ParameterList', text: ')', subtree_size: 7},
+// CHECK:STDOUT:       {kind: 'ParamList', text: ')', subtree_size: 7},
 // CHECK:STDOUT:     {kind: 'FunctionDecl', text: ';', subtree_size: 10},
 // CHECK:STDOUT:     {kind: 'FileEnd', text: ''},
 // CHECK:STDOUT:   ]

toolchain/parse/testdata/function/declaration/basic.carbon

@@ -11,8 +11,8 @@ fn F();
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:       {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:       {kind: 'Name', text: 'F'},
-// CHECK:STDOUT:         {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:       {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:         {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:       {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:     {kind: 'FunctionDecl', text: ';', subtree_size: 5},
 // CHECK:STDOUT:     {kind: 'FileEnd', text: ''},
 // CHECK:STDOUT:   ]

toolchain/parse/testdata/function/declaration/fail_missing_implicit_close.carbon

@@ -21,11 +21,11 @@ fn Div[();
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:       {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:       {kind: 'Name', text: 'Div'},
-// CHECK:STDOUT:         {kind: 'ImplicitParameterListStart', text: '['},
+// CHECK:STDOUT:         {kind: 'ImplicitParamListStart', text: '['},
 // CHECK:STDOUT:           {kind: 'Name', text: '(', has_error: yes},
 // CHECK:STDOUT:           {kind: 'InvalidParse', text: '(', has_error: yes},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: '(', has_error: yes, subtree_size: 3},
-// CHECK:STDOUT:       {kind: 'ImplicitParameterList', text: ']', has_error: yes, subtree_size: 5},
+// CHECK:STDOUT:       {kind: 'ImplicitParamList', text: ']', has_error: yes, subtree_size: 5},
 // CHECK:STDOUT:     {kind: 'FunctionDecl', text: 'fn', has_error: yes, subtree_size: 8},
 // CHECK:STDOUT:     {kind: 'FileEnd', text: ''},
 // CHECK:STDOUT:   ]

toolchain/parse/testdata/function/declaration/fail_skip_indented_newline_until_outdent.carbon

@@ -20,8 +20,8 @@ fn F();
 // CHECK:STDOUT:     {kind: 'FunctionDecl', text: 'fn', has_error: yes, subtree_size: 3},
 // CHECK:STDOUT:       {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:       {kind: 'Name', text: 'F'},
-// CHECK:STDOUT:         {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:       {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:         {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:       {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:     {kind: 'FunctionDecl', text: ';', subtree_size: 5},
 // CHECK:STDOUT:     {kind: 'FileEnd', text: ''},
 // CHECK:STDOUT:   ]

toolchain/parse/testdata/function/declaration/fail_skip_indented_newline_with_semi.carbon

@@ -20,8 +20,8 @@ fn F();
 // CHECK:STDOUT:     {kind: 'FunctionDecl', text: ';', has_error: yes, subtree_size: 3},
 // CHECK:STDOUT:       {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:       {kind: 'Name', text: 'F'},
-// CHECK:STDOUT:         {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:       {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:         {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:       {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:     {kind: 'FunctionDecl', text: ';', subtree_size: 5},
 // CHECK:STDOUT:     {kind: 'FileEnd', text: ''},
 // CHECK:STDOUT:   ]

toolchain/parse/testdata/function/declaration/fail_skip_indented_newline_without_semi.carbon

@@ -20,8 +20,8 @@ fn F();
 // CHECK:STDOUT:     {kind: 'FunctionDecl', text: 'fn', has_error: yes, subtree_size: 3},
 // CHECK:STDOUT:       {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:       {kind: 'Name', text: 'F'},
-// CHECK:STDOUT:         {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:       {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:         {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:       {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:     {kind: 'FunctionDecl', text: ';', subtree_size: 5},
 // CHECK:STDOUT:     {kind: 'FileEnd', text: ''},
 // CHECK:STDOUT:   ]

toolchain/parse/testdata/function/declaration/fail_skip_to_newline_without_semi.carbon

@@ -18,8 +18,8 @@ fn F();
 // CHECK:STDOUT:     {kind: 'FunctionDecl', text: 'fn', has_error: yes, subtree_size: 3},
 // CHECK:STDOUT:       {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:       {kind: 'Name', text: 'F'},
-// CHECK:STDOUT:         {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:       {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:         {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:       {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:     {kind: 'FunctionDecl', text: ';', subtree_size: 5},
 // CHECK:STDOUT:     {kind: 'FileEnd', text: ''},
 // CHECK:STDOUT:   ]

toolchain/parse/testdata/function/declaration/fail_skip_without_semi_to_curly.carbon

@@ -16,8 +16,8 @@ fn F();
 // CHECK:STDOUT:     {kind: 'EmptyDecl', text: 'struct', has_error: yes},
 // CHECK:STDOUT:       {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:       {kind: 'Name', text: 'F'},
-// CHECK:STDOUT:         {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:       {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:         {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:       {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:     {kind: 'FunctionDecl', text: ';', subtree_size: 5},
 // CHECK:STDOUT:     {kind: 'FileEnd', text: ''},
 // CHECK:STDOUT:   ]

toolchain/parse/testdata/function/declaration/fail_with_identifier_as_param.carbon

@@ -14,11 +14,11 @@ fn foo(bar);
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:       {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:       {kind: 'Name', text: 'foo'},
-// CHECK:STDOUT:         {kind: 'ParameterListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamListStart', text: '('},
 // CHECK:STDOUT:           {kind: 'Name', text: 'bar'},
 // CHECK:STDOUT:           {kind: 'InvalidParse', text: ')', has_error: yes},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: 'bar', has_error: yes, subtree_size: 3},
-// CHECK:STDOUT:       {kind: 'ParameterList', text: ')', has_error: yes, subtree_size: 5},
+// CHECK:STDOUT:       {kind: 'ParamList', text: ')', has_error: yes, subtree_size: 5},
 // CHECK:STDOUT:     {kind: 'FunctionDecl', text: ';', subtree_size: 8},
 // CHECK:STDOUT:     {kind: 'FileEnd', text: ''},
 // CHECK:STDOUT:   ]

toolchain/parse/testdata/function/declaration/implicit_empty.carbon

@@ -11,10 +11,10 @@ fn foo[]();
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:       {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:       {kind: 'Name', text: 'foo'},
-// CHECK:STDOUT:         {kind: 'ImplicitParameterListStart', text: '['},
-// CHECK:STDOUT:       {kind: 'ImplicitParameterList', text: ']', subtree_size: 2},
-// CHECK:STDOUT:         {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:       {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:         {kind: 'ImplicitParamListStart', text: '['},
+// CHECK:STDOUT:       {kind: 'ImplicitParamList', text: ']', subtree_size: 2},
+// CHECK:STDOUT:         {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:       {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:     {kind: 'FunctionDecl', text: ';', subtree_size: 7},
 // CHECK:STDOUT:     {kind: 'FileEnd', text: ''},
 // CHECK:STDOUT:   ]

toolchain/parse/testdata/function/declaration/implicit_params.carbon

@@ -11,17 +11,17 @@ fn foo[a: i32, b: i32]();
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:       {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:       {kind: 'Name', text: 'foo'},
-// CHECK:STDOUT:         {kind: 'ImplicitParameterListStart', text: '['},
+// CHECK:STDOUT:         {kind: 'ImplicitParamListStart', text: '['},
 // CHECK:STDOUT:           {kind: 'Name', text: 'a'},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterListComma', text: ','},
+// CHECK:STDOUT:         {kind: 'ParamListComma', text: ','},
 // CHECK:STDOUT:           {kind: 'Name', text: 'b'},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:       {kind: 'ImplicitParameterList', text: ']', subtree_size: 9},
-// CHECK:STDOUT:         {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:       {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:       {kind: 'ImplicitParamList', text: ']', subtree_size: 9},
+// CHECK:STDOUT:         {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:       {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:     {kind: 'FunctionDecl', text: ';', subtree_size: 14},
 // CHECK:STDOUT:     {kind: 'FileEnd', text: ''},
 // CHECK:STDOUT:   ]

toolchain/parse/testdata/function/declaration/params.carbon

@@ -11,15 +11,15 @@ fn foo(a: i32, b: i32);
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:       {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:       {kind: 'Name', text: 'foo'},
-// CHECK:STDOUT:         {kind: 'ParameterListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamListStart', text: '('},
 // CHECK:STDOUT:           {kind: 'Name', text: 'a'},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterListComma', text: ','},
+// CHECK:STDOUT:         {kind: 'ParamListComma', text: ','},
 // CHECK:STDOUT:           {kind: 'Name', text: 'b'},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:       {kind: 'ParameterList', text: ')', subtree_size: 9},
+// CHECK:STDOUT:       {kind: 'ParamList', text: ')', subtree_size: 9},
 // CHECK:STDOUT:     {kind: 'FunctionDecl', text: ';', subtree_size: 12},
 // CHECK:STDOUT:     {kind: 'FileEnd', text: ''},
 // CHECK:STDOUT:   ]

toolchain/parse/testdata/function/declaration/with_return_type.carbon

@@ -11,8 +11,8 @@ fn foo() -> u32;
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:       {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:       {kind: 'Name', text: 'foo'},
-// CHECK:STDOUT:         {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:       {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:         {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:       {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:         {kind: 'Literal', text: 'u32'},
 // CHECK:STDOUT:       {kind: 'ReturnType', text: '->', subtree_size: 2},
 // CHECK:STDOUT:     {kind: 'FunctionDecl', text: ';', subtree_size: 7},

toolchain/parse/testdata/function/definition/basic.carbon

@@ -12,8 +12,8 @@ fn F() {
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'F'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
 // CHECK:STDOUT:     {kind: 'FunctionDefinition', text: '}', subtree_size: 6},
 // CHECK:STDOUT:     {kind: 'FileEnd', text: ''},

toolchain/parse/testdata/function/definition/fail_identifier_in_statements.carbon

@@ -18,8 +18,8 @@ fn F() {
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'F'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
 // CHECK:STDOUT:       {kind: 'NameExpr', text: 'bar'},
 // CHECK:STDOUT:     {kind: 'FunctionDefinition', text: '}', has_error: yes, subtree_size: 7},

toolchain/parse/testdata/function/definition/with_params.carbon

@@ -13,15 +13,15 @@ fn foo(bar: i64, baz: i64) {
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'foo'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
 // CHECK:STDOUT:             {kind: 'Name', text: 'bar'},
 // CHECK:STDOUT:             {kind: 'Literal', text: 'i64'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:           {kind: 'ParameterListComma', text: ','},
+// CHECK:STDOUT:           {kind: 'ParamListComma', text: ','},
 // CHECK:STDOUT:             {kind: 'Name', text: 'baz'},
 // CHECK:STDOUT:             {kind: 'Literal', text: 'i64'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 9},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 9},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 12},
 // CHECK:STDOUT:             {kind: 'NameExpr', text: 'foo'},
 // CHECK:STDOUT:           {kind: 'CallExprStart', text: '(', subtree_size: 2},

toolchain/parse/testdata/function/definition/with_return_type.carbon

@@ -13,8 +13,8 @@ fn foo() -> f64 {
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'foo'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'f64'},
 // CHECK:STDOUT:         {kind: 'ReturnType', text: '->', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 7},

toolchain/parse/testdata/generics/deduced_params/empty.carbon

@@ -13,17 +13,17 @@ interface Bar[]() {}
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:       {kind: 'ClassIntroducer', text: 'class'},
 // CHECK:STDOUT:       {kind: 'Name', text: 'Foo'},
-// CHECK:STDOUT:         {kind: 'ImplicitParameterListStart', text: '['},
-// CHECK:STDOUT:       {kind: 'ImplicitParameterList', text: ']', subtree_size: 2},
-// CHECK:STDOUT:         {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:       {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:         {kind: 'ImplicitParamListStart', text: '['},
+// CHECK:STDOUT:       {kind: 'ImplicitParamList', text: ']', subtree_size: 2},
+// CHECK:STDOUT:         {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:       {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:     {kind: 'ClassDecl', text: ';', subtree_size: 7},
 // CHECK:STDOUT:         {kind: 'InterfaceIntroducer', text: 'interface'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'Bar'},
-// CHECK:STDOUT:           {kind: 'ImplicitParameterListStart', text: '['},
-// CHECK:STDOUT:         {kind: 'ImplicitParameterList', text: ']', subtree_size: 2},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ImplicitParamListStart', text: '['},
+// CHECK:STDOUT:         {kind: 'ImplicitParamList', text: ']', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 7},
 // CHECK:STDOUT:     {kind: 'InterfaceDefinition', text: '}', subtree_size: 8},
 // CHECK:STDOUT:     {kind: 'FileEnd', text: ''},

toolchain/parse/testdata/generics/deduced_params/fail_no_parens.carbon

@@ -29,29 +29,29 @@ interface Bar[a: i32] {}
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:       {kind: 'ClassIntroducer', text: 'class'},
 // CHECK:STDOUT:       {kind: 'Name', text: 'Foo'},
-// CHECK:STDOUT:         {kind: 'ImplicitParameterListStart', text: '['},
-// CHECK:STDOUT:       {kind: 'ImplicitParameterList', text: ']', subtree_size: 2},
+// CHECK:STDOUT:         {kind: 'ImplicitParamListStart', text: '['},
+// CHECK:STDOUT:       {kind: 'ImplicitParamList', text: ']', subtree_size: 2},
 // CHECK:STDOUT:     {kind: 'ClassDecl', text: ';', has_error: yes, subtree_size: 5},
 // CHECK:STDOUT:       {kind: 'ClassIntroducer', text: 'class'},
 // CHECK:STDOUT:       {kind: 'Name', text: 'Foo'},
-// CHECK:STDOUT:         {kind: 'ImplicitParameterListStart', text: '['},
+// CHECK:STDOUT:         {kind: 'ImplicitParamListStart', text: '['},
 // CHECK:STDOUT:           {kind: 'Name', text: 'a'},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:       {kind: 'ImplicitParameterList', text: ']', subtree_size: 5},
+// CHECK:STDOUT:       {kind: 'ImplicitParamList', text: ']', subtree_size: 5},
 // CHECK:STDOUT:     {kind: 'ClassDecl', text: ';', has_error: yes, subtree_size: 8},
 // CHECK:STDOUT:       {kind: 'InterfaceIntroducer', text: 'interface'},
 // CHECK:STDOUT:       {kind: 'Name', text: 'Bar'},
-// CHECK:STDOUT:         {kind: 'ImplicitParameterListStart', text: '['},
-// CHECK:STDOUT:       {kind: 'ImplicitParameterList', text: ']', subtree_size: 2},
+// CHECK:STDOUT:         {kind: 'ImplicitParamListStart', text: '['},
+// CHECK:STDOUT:       {kind: 'ImplicitParamList', text: ']', subtree_size: 2},
 // CHECK:STDOUT:     {kind: 'InterfaceDecl', text: 'interface', has_error: yes, subtree_size: 5},
 // CHECK:STDOUT:       {kind: 'InterfaceIntroducer', text: 'interface'},
 // CHECK:STDOUT:       {kind: 'Name', text: 'Bar'},
-// CHECK:STDOUT:         {kind: 'ImplicitParameterListStart', text: '['},
+// CHECK:STDOUT:         {kind: 'ImplicitParamListStart', text: '['},
 // CHECK:STDOUT:           {kind: 'Name', text: 'a'},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:       {kind: 'ImplicitParameterList', text: ']', subtree_size: 5},
+// CHECK:STDOUT:       {kind: 'ImplicitParamList', text: ']', subtree_size: 5},
 // CHECK:STDOUT:     {kind: 'InterfaceDecl', text: 'interface', has_error: yes, subtree_size: 8},
 // CHECK:STDOUT:     {kind: 'FileEnd', text: ''},
 // CHECK:STDOUT:   ]

toolchain/parse/testdata/generics/deduced_params/one.carbon

@@ -13,23 +13,23 @@ interface Bar[a: i32]() {}
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:       {kind: 'ClassIntroducer', text: 'class'},
 // CHECK:STDOUT:       {kind: 'Name', text: 'Foo'},
-// CHECK:STDOUT:         {kind: 'ImplicitParameterListStart', text: '['},
+// CHECK:STDOUT:         {kind: 'ImplicitParamListStart', text: '['},
 // CHECK:STDOUT:           {kind: 'Name', text: 'a'},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:       {kind: 'ImplicitParameterList', text: ']', subtree_size: 5},
-// CHECK:STDOUT:         {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:       {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:       {kind: 'ImplicitParamList', text: ']', subtree_size: 5},
+// CHECK:STDOUT:         {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:       {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:     {kind: 'ClassDecl', text: ';', subtree_size: 10},
 // CHECK:STDOUT:         {kind: 'InterfaceIntroducer', text: 'interface'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'Bar'},
-// CHECK:STDOUT:           {kind: 'ImplicitParameterListStart', text: '['},
+// CHECK:STDOUT:           {kind: 'ImplicitParamListStart', text: '['},
 // CHECK:STDOUT:             {kind: 'Name', text: 'a'},
 // CHECK:STDOUT:             {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ImplicitParameterList', text: ']', subtree_size: 5},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:         {kind: 'ImplicitParamList', text: ']', subtree_size: 5},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 10},
 // CHECK:STDOUT:     {kind: 'InterfaceDefinition', text: '}', subtree_size: 11},
 // CHECK:STDOUT:     {kind: 'FileEnd', text: ''},

toolchain/parse/testdata/generics/deduced_params/one_suffix_comma.carbon

@@ -13,25 +13,25 @@ interface Bar[a: i32,]() {}
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:       {kind: 'ClassIntroducer', text: 'class'},
 // CHECK:STDOUT:       {kind: 'Name', text: 'Foo'},
-// CHECK:STDOUT:         {kind: 'ImplicitParameterListStart', text: '['},
+// CHECK:STDOUT:         {kind: 'ImplicitParamListStart', text: '['},
 // CHECK:STDOUT:           {kind: 'Name', text: 'a'},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterListComma', text: ','},
-// CHECK:STDOUT:       {kind: 'ImplicitParameterList', text: ']', subtree_size: 6},
-// CHECK:STDOUT:         {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:       {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:         {kind: 'ParamListComma', text: ','},
+// CHECK:STDOUT:       {kind: 'ImplicitParamList', text: ']', subtree_size: 6},
+// CHECK:STDOUT:         {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:       {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:     {kind: 'ClassDecl', text: ';', subtree_size: 11},
 // CHECK:STDOUT:         {kind: 'InterfaceIntroducer', text: 'interface'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'Bar'},
-// CHECK:STDOUT:           {kind: 'ImplicitParameterListStart', text: '['},
+// CHECK:STDOUT:           {kind: 'ImplicitParamListStart', text: '['},
 // CHECK:STDOUT:             {kind: 'Name', text: 'a'},
 // CHECK:STDOUT:             {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:           {kind: 'ParameterListComma', text: ','},
-// CHECK:STDOUT:         {kind: 'ImplicitParameterList', text: ']', subtree_size: 6},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListComma', text: ','},
+// CHECK:STDOUT:         {kind: 'ImplicitParamList', text: ']', subtree_size: 6},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 11},
 // CHECK:STDOUT:     {kind: 'InterfaceDefinition', text: '}', subtree_size: 12},
 // CHECK:STDOUT:     {kind: 'FileEnd', text: ''},

toolchain/parse/testdata/generics/deduced_params/six.carbon

@@ -13,63 +13,63 @@ interface Bar[a: i32, b: i32, c: i32, d: i32, e: i32, f: i32]() {}
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:       {kind: 'ClassIntroducer', text: 'class'},
 // CHECK:STDOUT:       {kind: 'Name', text: 'Foo'},
-// CHECK:STDOUT:         {kind: 'ImplicitParameterListStart', text: '['},
+// CHECK:STDOUT:         {kind: 'ImplicitParamListStart', text: '['},
 // CHECK:STDOUT:           {kind: 'Name', text: 'a'},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterListComma', text: ','},
+// CHECK:STDOUT:         {kind: 'ParamListComma', text: ','},
 // CHECK:STDOUT:           {kind: 'Name', text: 'b'},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterListComma', text: ','},
+// CHECK:STDOUT:         {kind: 'ParamListComma', text: ','},
 // CHECK:STDOUT:           {kind: 'Name', text: 'c'},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterListComma', text: ','},
+// CHECK:STDOUT:         {kind: 'ParamListComma', text: ','},
 // CHECK:STDOUT:           {kind: 'Name', text: 'd'},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterListComma', text: ','},
+// CHECK:STDOUT:         {kind: 'ParamListComma', text: ','},
 // CHECK:STDOUT:           {kind: 'Name', text: 'e'},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterListComma', text: ','},
+// CHECK:STDOUT:         {kind: 'ParamListComma', text: ','},
 // CHECK:STDOUT:           {kind: 'Name', text: 'f'},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:       {kind: 'ImplicitParameterList', text: ']', subtree_size: 25},
-// CHECK:STDOUT:         {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:       {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:       {kind: 'ImplicitParamList', text: ']', subtree_size: 25},
+// CHECK:STDOUT:         {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:       {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:     {kind: 'ClassDecl', text: ';', subtree_size: 30},
 // CHECK:STDOUT:         {kind: 'InterfaceIntroducer', text: 'interface'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'Bar'},
-// CHECK:STDOUT:           {kind: 'ImplicitParameterListStart', text: '['},
+// CHECK:STDOUT:           {kind: 'ImplicitParamListStart', text: '['},
 // CHECK:STDOUT:             {kind: 'Name', text: 'a'},
 // CHECK:STDOUT:             {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:           {kind: 'ParameterListComma', text: ','},
+// CHECK:STDOUT:           {kind: 'ParamListComma', text: ','},
 // CHECK:STDOUT:             {kind: 'Name', text: 'b'},
 // CHECK:STDOUT:             {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:           {kind: 'ParameterListComma', text: ','},
+// CHECK:STDOUT:           {kind: 'ParamListComma', text: ','},
 // CHECK:STDOUT:             {kind: 'Name', text: 'c'},
 // CHECK:STDOUT:             {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:           {kind: 'ParameterListComma', text: ','},
+// CHECK:STDOUT:           {kind: 'ParamListComma', text: ','},
 // CHECK:STDOUT:             {kind: 'Name', text: 'd'},
 // CHECK:STDOUT:             {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:           {kind: 'ParameterListComma', text: ','},
+// CHECK:STDOUT:           {kind: 'ParamListComma', text: ','},
 // CHECK:STDOUT:             {kind: 'Name', text: 'e'},
 // CHECK:STDOUT:             {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:           {kind: 'ParameterListComma', text: ','},
+// CHECK:STDOUT:           {kind: 'ParamListComma', text: ','},
 // CHECK:STDOUT:             {kind: 'Name', text: 'f'},
 // CHECK:STDOUT:             {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ImplicitParameterList', text: ']', subtree_size: 25},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:         {kind: 'ImplicitParamList', text: ']', subtree_size: 25},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 30},
 // CHECK:STDOUT:     {kind: 'InterfaceDefinition', text: '}', subtree_size: 31},
 // CHECK:STDOUT:     {kind: 'FileEnd', text: ''},

toolchain/parse/testdata/generics/deduced_params/two.carbon

@@ -13,31 +13,31 @@ interface Bar[a: i32, b: i32]() {}
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:       {kind: 'ClassIntroducer', text: 'class'},
 // CHECK:STDOUT:       {kind: 'Name', text: 'Foo'},
-// CHECK:STDOUT:         {kind: 'ImplicitParameterListStart', text: '['},
+// CHECK:STDOUT:         {kind: 'ImplicitParamListStart', text: '['},
 // CHECK:STDOUT:           {kind: 'Name', text: 'a'},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterListComma', text: ','},
+// CHECK:STDOUT:         {kind: 'ParamListComma', text: ','},
 // CHECK:STDOUT:           {kind: 'Name', text: 'b'},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:       {kind: 'ImplicitParameterList', text: ']', subtree_size: 9},
-// CHECK:STDOUT:         {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:       {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:       {kind: 'ImplicitParamList', text: ']', subtree_size: 9},
+// CHECK:STDOUT:         {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:       {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:     {kind: 'ClassDecl', text: ';', subtree_size: 14},
 // CHECK:STDOUT:         {kind: 'InterfaceIntroducer', text: 'interface'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'Bar'},
-// CHECK:STDOUT:           {kind: 'ImplicitParameterListStart', text: '['},
+// CHECK:STDOUT:           {kind: 'ImplicitParamListStart', text: '['},
 // CHECK:STDOUT:             {kind: 'Name', text: 'a'},
 // CHECK:STDOUT:             {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:           {kind: 'ParameterListComma', text: ','},
+// CHECK:STDOUT:           {kind: 'ParamListComma', text: ','},
 // CHECK:STDOUT:             {kind: 'Name', text: 'b'},
 // CHECK:STDOUT:             {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ImplicitParameterList', text: ']', subtree_size: 9},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:         {kind: 'ImplicitParamList', text: ']', subtree_size: 9},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 14},
 // CHECK:STDOUT:     {kind: 'InterfaceDefinition', text: '}', subtree_size: 15},
 // CHECK:STDOUT:     {kind: 'FileEnd', text: ''},

toolchain/parse/testdata/generics/deduced_params/two_suffix_comma.carbon

@@ -13,33 +13,33 @@ interface Bar[a: i32, b: i32,]() {}
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:       {kind: 'ClassIntroducer', text: 'class'},
 // CHECK:STDOUT:       {kind: 'Name', text: 'Foo'},
-// CHECK:STDOUT:         {kind: 'ImplicitParameterListStart', text: '['},
+// CHECK:STDOUT:         {kind: 'ImplicitParamListStart', text: '['},
 // CHECK:STDOUT:           {kind: 'Name', text: 'a'},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterListComma', text: ','},
+// CHECK:STDOUT:         {kind: 'ParamListComma', text: ','},
 // CHECK:STDOUT:           {kind: 'Name', text: 'b'},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterListComma', text: ','},
-// CHECK:STDOUT:       {kind: 'ImplicitParameterList', text: ']', subtree_size: 10},
-// CHECK:STDOUT:         {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:       {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:         {kind: 'ParamListComma', text: ','},
+// CHECK:STDOUT:       {kind: 'ImplicitParamList', text: ']', subtree_size: 10},
+// CHECK:STDOUT:         {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:       {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:     {kind: 'ClassDecl', text: ';', subtree_size: 15},
 // CHECK:STDOUT:         {kind: 'InterfaceIntroducer', text: 'interface'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'Bar'},
-// CHECK:STDOUT:           {kind: 'ImplicitParameterListStart', text: '['},
+// CHECK:STDOUT:           {kind: 'ImplicitParamListStart', text: '['},
 // CHECK:STDOUT:             {kind: 'Name', text: 'a'},
 // CHECK:STDOUT:             {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:           {kind: 'ParameterListComma', text: ','},
+// CHECK:STDOUT:           {kind: 'ParamListComma', text: ','},
 // CHECK:STDOUT:             {kind: 'Name', text: 'b'},
 // CHECK:STDOUT:             {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:           {kind: 'ParameterListComma', text: ','},
-// CHECK:STDOUT:         {kind: 'ImplicitParameterList', text: ']', subtree_size: 10},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListComma', text: ','},
+// CHECK:STDOUT:         {kind: 'ImplicitParamList', text: ']', subtree_size: 10},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 15},
 // CHECK:STDOUT:     {kind: 'InterfaceDefinition', text: '}', subtree_size: 16},
 // CHECK:STDOUT:     {kind: 'FileEnd', text: ''},

toolchain/parse/testdata/generics/generic_params/basic.carbon

@@ -11,11 +11,11 @@ fn foo(a:! i32);
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:       {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:       {kind: 'Name', text: 'foo'},
-// CHECK:STDOUT:         {kind: 'ParameterListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamListStart', text: '('},
 // CHECK:STDOUT:           {kind: 'Name', text: 'a'},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'GenericPatternBinding', text: ':!', subtree_size: 3},
-// CHECK:STDOUT:       {kind: 'ParameterList', text: ')', subtree_size: 5},
+// CHECK:STDOUT:       {kind: 'ParamList', text: ')', subtree_size: 5},
 // CHECK:STDOUT:     {kind: 'FunctionDecl', text: ';', subtree_size: 8},
 // CHECK:STDOUT:     {kind: 'FileEnd', text: ''},
 // CHECK:STDOUT:   ]

toolchain/parse/testdata/generics/generic_params/template.carbon

@@ -11,12 +11,12 @@ fn foo(template a:! i32);
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:       {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:       {kind: 'Name', text: 'foo'},
-// CHECK:STDOUT:         {kind: 'ParameterListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamListStart', text: '('},
 // CHECK:STDOUT:             {kind: 'Name', text: 'a'},
 // CHECK:STDOUT:             {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:           {kind: 'GenericPatternBinding', text: ':!', subtree_size: 3},
 // CHECK:STDOUT:         {kind: 'Template', text: 'template', subtree_size: 4},
-// CHECK:STDOUT:       {kind: 'ParameterList', text: ')', subtree_size: 6},
+// CHECK:STDOUT:       {kind: 'ParamList', text: ')', subtree_size: 6},
 // CHECK:STDOUT:     {kind: 'FunctionDecl', text: ';', subtree_size: 9},
 // CHECK:STDOUT:     {kind: 'FileEnd', text: ''},
 // CHECK:STDOUT:   ]

toolchain/parse/testdata/generics/generic_params/template_addr.carbon

@@ -11,13 +11,13 @@ fn foo(template addr a:! i32);
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:       {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:       {kind: 'Name', text: 'foo'},
-// CHECK:STDOUT:         {kind: 'ParameterListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamListStart', text: '('},
 // CHECK:STDOUT:               {kind: 'Name', text: 'a'},
 // CHECK:STDOUT:               {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:             {kind: 'GenericPatternBinding', text: ':!', subtree_size: 3},
 // CHECK:STDOUT:           {kind: 'Address', text: 'addr', subtree_size: 4},
 // CHECK:STDOUT:         {kind: 'Template', text: 'template', subtree_size: 5},
-// CHECK:STDOUT:       {kind: 'ParameterList', text: ')', subtree_size: 7},
+// CHECK:STDOUT:       {kind: 'ParamList', text: ')', subtree_size: 7},
 // CHECK:STDOUT:     {kind: 'FunctionDecl', text: ';', subtree_size: 10},
 // CHECK:STDOUT:     {kind: 'FileEnd', text: ''},
 // CHECK:STDOUT:   ]

toolchain/parse/testdata/generics/interface/basic.carbon

@@ -17,31 +17,31 @@ interface Foo {
 // CHECK:STDOUT:       {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 3},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'Add'},
-// CHECK:STDOUT:           {kind: 'ImplicitParameterListStart', text: '['},
+// CHECK:STDOUT:           {kind: 'ImplicitParamListStart', text: '['},
 // CHECK:STDOUT:             {kind: 'SelfValueName', text: 'self'},
 // CHECK:STDOUT:             {kind: 'SelfTypeNameExpr', text: 'Self'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ImplicitParameterList', text: ']', subtree_size: 5},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ImplicitParamList', text: ']', subtree_size: 5},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
 // CHECK:STDOUT:             {kind: 'Name', text: 'b'},
 // CHECK:STDOUT:             {kind: 'SelfTypeNameExpr', text: 'Self'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 5},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 5},
 // CHECK:STDOUT:           {kind: 'SelfTypeNameExpr', text: 'Self'},
 // CHECK:STDOUT:         {kind: 'ReturnType', text: '->', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDecl', text: ';', subtree_size: 15},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'Add'},
-// CHECK:STDOUT:           {kind: 'ImplicitParameterListStart', text: '['},
+// CHECK:STDOUT:           {kind: 'ImplicitParamListStart', text: '['},
 // CHECK:STDOUT:             {kind: 'SelfValueName', text: 'self'},
 // CHECK:STDOUT:             {kind: 'NameExpr', text: 'foo'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ImplicitParameterList', text: ']', subtree_size: 5},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ImplicitParamList', text: ']', subtree_size: 5},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
 // CHECK:STDOUT:             {kind: 'Name', text: 'b'},
 // CHECK:STDOUT:             {kind: 'SelfTypeNameExpr', text: 'Self'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 5},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 5},
 // CHECK:STDOUT:           {kind: 'SelfTypeNameExpr', text: 'Self'},
 // CHECK:STDOUT:         {kind: 'ReturnType', text: '->', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDecl', text: ';', subtree_size: 15},

toolchain/parse/testdata/generics/interface/fail_no_impl_allowed.carbon

@@ -21,16 +21,16 @@ interface Foo {
 // CHECK:STDOUT:       {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 3},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'Add'},
-// CHECK:STDOUT:           {kind: 'ImplicitParameterListStart', text: '['},
+// CHECK:STDOUT:           {kind: 'ImplicitParamListStart', text: '['},
 // CHECK:STDOUT:             {kind: 'SelfValueName', text: 'self'},
 // CHECK:STDOUT:             {kind: 'SelfTypeNameExpr', text: 'Self'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ImplicitParameterList', text: ']', subtree_size: 5},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ImplicitParamList', text: ']', subtree_size: 5},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
 // CHECK:STDOUT:             {kind: 'Name', text: 'b'},
 // CHECK:STDOUT:             {kind: 'SelfTypeNameExpr', text: 'Self'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 5},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 5},
 // CHECK:STDOUT:           {kind: 'SelfTypeNameExpr', text: 'Self'},
 // CHECK:STDOUT:         {kind: 'ReturnType', text: '->', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDecl', text: 'fn', has_error: yes, subtree_size: 15},

toolchain/parse/testdata/generics/interface/fail_self_param_syntax.carbon

@@ -24,31 +24,31 @@ interface Foo {
 // CHECK:STDOUT:       {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 3},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'Sub'},
-// CHECK:STDOUT:           {kind: 'ImplicitParameterListStart', text: '['},
+// CHECK:STDOUT:           {kind: 'ImplicitParamListStart', text: '['},
 // CHECK:STDOUT:             {kind: 'Name', text: 'me'},
 // CHECK:STDOUT:             {kind: 'InvalidParse', text: 'Self', has_error: yes},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: 'me', has_error: yes, subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ImplicitParameterList', text: ']', has_error: yes, subtree_size: 5},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ImplicitParamList', text: ']', has_error: yes, subtree_size: 5},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
 // CHECK:STDOUT:             {kind: 'Name', text: 'b'},
 // CHECK:STDOUT:             {kind: 'SelfTypeNameExpr', text: 'Self'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 5},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 5},
 // CHECK:STDOUT:           {kind: 'SelfTypeNameExpr', text: 'Self'},
 // CHECK:STDOUT:         {kind: 'ReturnType', text: '->', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDecl', text: ';', subtree_size: 15},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'Mul'},
-// CHECK:STDOUT:           {kind: 'ImplicitParameterListStart', text: '['},
+// CHECK:STDOUT:           {kind: 'ImplicitParamListStart', text: '['},
 // CHECK:STDOUT:             {kind: 'Name', text: 'Self', has_error: yes},
 // CHECK:STDOUT:             {kind: 'InvalidParse', text: 'Self', has_error: yes},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: 'Self', has_error: yes, subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ImplicitParameterList', text: ']', has_error: yes, subtree_size: 5},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ImplicitParamList', text: ']', has_error: yes, subtree_size: 5},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
 // CHECK:STDOUT:             {kind: 'Name', text: 'b'},
 // CHECK:STDOUT:             {kind: 'SelfTypeNameExpr', text: 'Self'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 5},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 5},
 // CHECK:STDOUT:           {kind: 'SelfTypeNameExpr', text: 'Self'},
 // CHECK:STDOUT:         {kind: 'ReturnType', text: '->', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDecl', text: ';', subtree_size: 15},

toolchain/parse/testdata/generics/interface/non_instance_fn.carbon

@@ -16,8 +16,8 @@ interface Foo {
 // CHECK:STDOUT:       {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 3},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'FooFactory'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:           {kind: 'SelfTypeNameExpr', text: 'Self'},
 // CHECK:STDOUT:         {kind: 'ReturnType', text: '->', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDecl', text: ';', subtree_size: 7},

toolchain/parse/testdata/generics/interface/self_pointer.carbon

@@ -17,35 +17,35 @@ interface Foo {
 // CHECK:STDOUT:       {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 3},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'Sub'},
-// CHECK:STDOUT:           {kind: 'ImplicitParameterListStart', text: '['},
+// CHECK:STDOUT:           {kind: 'ImplicitParamListStart', text: '['},
 // CHECK:STDOUT:               {kind: 'SelfValueName', text: 'self'},
 // CHECK:STDOUT:                 {kind: 'SelfTypeNameExpr', text: 'Self'},
 // CHECK:STDOUT:               {kind: 'PostfixOperator', text: '*', subtree_size: 2},
 // CHECK:STDOUT:             {kind: 'PatternBinding', text: ':', subtree_size: 4},
 // CHECK:STDOUT:           {kind: 'Address', text: 'addr', subtree_size: 5},
-// CHECK:STDOUT:         {kind: 'ImplicitParameterList', text: ']', subtree_size: 7},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ImplicitParamList', text: ']', subtree_size: 7},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
 // CHECK:STDOUT:             {kind: 'Name', text: 'b'},
 // CHECK:STDOUT:             {kind: 'SelfTypeNameExpr', text: 'Self'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 5},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 5},
 // CHECK:STDOUT:           {kind: 'SelfTypeNameExpr', text: 'Self'},
 // CHECK:STDOUT:         {kind: 'ReturnType', text: '->', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDecl', text: ';', subtree_size: 17},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'Sub'},
-// CHECK:STDOUT:           {kind: 'ImplicitParameterListStart', text: '['},
+// CHECK:STDOUT:           {kind: 'ImplicitParamListStart', text: '['},
 // CHECK:STDOUT:               {kind: 'SelfValueName', text: 'self'},
 // CHECK:STDOUT:                 {kind: 'NameExpr', text: 'foo'},
 // CHECK:STDOUT:               {kind: 'PostfixOperator', text: '*', subtree_size: 2},
 // CHECK:STDOUT:             {kind: 'PatternBinding', text: ':', subtree_size: 4},
 // CHECK:STDOUT:           {kind: 'Address', text: 'addr', subtree_size: 5},
-// CHECK:STDOUT:         {kind: 'ImplicitParameterList', text: ']', subtree_size: 7},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ImplicitParamList', text: ']', subtree_size: 7},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
 // CHECK:STDOUT:             {kind: 'Name', text: 'b'},
 // CHECK:STDOUT:             {kind: 'SelfTypeNameExpr', text: 'Self'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 5},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 5},
 // CHECK:STDOUT:           {kind: 'SelfTypeNameExpr', text: 'Self'},
 // CHECK:STDOUT:         {kind: 'ReturnType', text: '->', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDecl', text: ';', subtree_size: 17},

toolchain/parse/testdata/generics/named_constraint/basic.carbon

@@ -16,8 +16,8 @@ constraint Foo {
 // CHECK:STDOUT:       {kind: 'NamedConstraintDefinitionStart', text: '{', subtree_size: 3},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'Baz'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDecl', text: ';', subtree_size: 5},
 // CHECK:STDOUT:     {kind: 'NamedConstraintDefinition', text: '}', subtree_size: 9},
 // CHECK:STDOUT:     {kind: 'FileEnd', text: ''},

toolchain/parse/testdata/generics/named_constraint/fail_no_impl_allowed.carbon

@@ -19,16 +19,16 @@ constraint Foo {
 // CHECK:STDOUT:       {kind: 'NamedConstraintDefinitionStart', text: '{', subtree_size: 3},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'Add'},
-// CHECK:STDOUT:           {kind: 'ImplicitParameterListStart', text: '['},
+// CHECK:STDOUT:           {kind: 'ImplicitParamListStart', text: '['},
 // CHECK:STDOUT:             {kind: 'SelfValueName', text: 'self'},
 // CHECK:STDOUT:             {kind: 'SelfTypeNameExpr', text: 'Self'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ImplicitParameterList', text: ']', subtree_size: 5},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ImplicitParamList', text: ']', subtree_size: 5},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
 // CHECK:STDOUT:             {kind: 'Name', text: 'b'},
 // CHECK:STDOUT:             {kind: 'SelfTypeNameExpr', text: 'Self'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 5},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 5},
 // CHECK:STDOUT:           {kind: 'SelfTypeNameExpr', text: 'Self'},
 // CHECK:STDOUT:         {kind: 'ReturnType', text: '->', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDecl', text: 'fn', has_error: yes, subtree_size: 15},

toolchain/parse/testdata/generics/params/empty.carbon

@@ -13,13 +13,13 @@ interface Bar() {}
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:       {kind: 'ClassIntroducer', text: 'class'},
 // CHECK:STDOUT:       {kind: 'Name', text: 'Foo'},
-// CHECK:STDOUT:         {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:       {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:         {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:       {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:     {kind: 'ClassDecl', text: ';', subtree_size: 5},
 // CHECK:STDOUT:         {kind: 'InterfaceIntroducer', text: 'interface'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'Bar'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 5},
 // CHECK:STDOUT:     {kind: 'InterfaceDefinition', text: '}', subtree_size: 6},
 // CHECK:STDOUT:     {kind: 'FileEnd', text: ''},

toolchain/parse/testdata/generics/params/one.carbon

@@ -13,19 +13,19 @@ interface Bar(a: i32) {}
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:       {kind: 'ClassIntroducer', text: 'class'},
 // CHECK:STDOUT:       {kind: 'Name', text: 'Foo'},
-// CHECK:STDOUT:         {kind: 'ParameterListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamListStart', text: '('},
 // CHECK:STDOUT:           {kind: 'Name', text: 'a'},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:       {kind: 'ParameterList', text: ')', subtree_size: 5},
+// CHECK:STDOUT:       {kind: 'ParamList', text: ')', subtree_size: 5},
 // CHECK:STDOUT:     {kind: 'ClassDecl', text: ';', subtree_size: 8},
 // CHECK:STDOUT:         {kind: 'InterfaceIntroducer', text: 'interface'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'Bar'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
 // CHECK:STDOUT:             {kind: 'Name', text: 'a'},
 // CHECK:STDOUT:             {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 5},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 5},
 // CHECK:STDOUT:       {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 8},
 // CHECK:STDOUT:     {kind: 'InterfaceDefinition', text: '}', subtree_size: 9},
 // CHECK:STDOUT:     {kind: 'FileEnd', text: ''},

toolchain/parse/testdata/generics/params/one_suffix_comma.carbon

@@ -13,21 +13,21 @@ interface Bar(a: i32,) {}
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:       {kind: 'ClassIntroducer', text: 'class'},
 // CHECK:STDOUT:       {kind: 'Name', text: 'Foo'},
-// CHECK:STDOUT:         {kind: 'ParameterListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamListStart', text: '('},
 // CHECK:STDOUT:           {kind: 'Name', text: 'a'},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterListComma', text: ','},
-// CHECK:STDOUT:       {kind: 'ParameterList', text: ')', subtree_size: 6},
+// CHECK:STDOUT:         {kind: 'ParamListComma', text: ','},
+// CHECK:STDOUT:       {kind: 'ParamList', text: ')', subtree_size: 6},
 // CHECK:STDOUT:     {kind: 'ClassDecl', text: ';', subtree_size: 9},
 // CHECK:STDOUT:         {kind: 'InterfaceIntroducer', text: 'interface'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'Bar'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
 // CHECK:STDOUT:             {kind: 'Name', text: 'a'},
 // CHECK:STDOUT:             {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:           {kind: 'ParameterListComma', text: ','},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 6},
+// CHECK:STDOUT:           {kind: 'ParamListComma', text: ','},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 6},
 // CHECK:STDOUT:       {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 9},
 // CHECK:STDOUT:     {kind: 'InterfaceDefinition', text: '}', subtree_size: 10},
 // CHECK:STDOUT:     {kind: 'FileEnd', text: ''},

toolchain/parse/testdata/generics/params/six.carbon

@@ -13,59 +13,59 @@ interface Bar(a: i32, b: i32, c: i32, d: i32, e: i32, f: i32) {}
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:       {kind: 'ClassIntroducer', text: 'class'},
 // CHECK:STDOUT:       {kind: 'Name', text: 'Foo'},
-// CHECK:STDOUT:         {kind: 'ParameterListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamListStart', text: '('},
 // CHECK:STDOUT:           {kind: 'Name', text: 'a'},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterListComma', text: ','},
+// CHECK:STDOUT:         {kind: 'ParamListComma', text: ','},
 // CHECK:STDOUT:           {kind: 'Name', text: 'b'},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterListComma', text: ','},
+// CHECK:STDOUT:         {kind: 'ParamListComma', text: ','},
 // CHECK:STDOUT:           {kind: 'Name', text: 'c'},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterListComma', text: ','},
+// CHECK:STDOUT:         {kind: 'ParamListComma', text: ','},
 // CHECK:STDOUT:           {kind: 'Name', text: 'd'},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterListComma', text: ','},
+// CHECK:STDOUT:         {kind: 'ParamListComma', text: ','},
 // CHECK:STDOUT:           {kind: 'Name', text: 'e'},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterListComma', text: ','},
+// CHECK:STDOUT:         {kind: 'ParamListComma', text: ','},
 // CHECK:STDOUT:           {kind: 'Name', text: 'f'},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:       {kind: 'ParameterList', text: ')', subtree_size: 25},
+// CHECK:STDOUT:       {kind: 'ParamList', text: ')', subtree_size: 25},
 // CHECK:STDOUT:     {kind: 'ClassDecl', text: ';', subtree_size: 28},
 // CHECK:STDOUT:         {kind: 'InterfaceIntroducer', text: 'interface'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'Bar'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
 // CHECK:STDOUT:             {kind: 'Name', text: 'a'},
 // CHECK:STDOUT:             {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:           {kind: 'ParameterListComma', text: ','},
+// CHECK:STDOUT:           {kind: 'ParamListComma', text: ','},
 // CHECK:STDOUT:             {kind: 'Name', text: 'b'},
 // CHECK:STDOUT:             {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:           {kind: 'ParameterListComma', text: ','},
+// CHECK:STDOUT:           {kind: 'ParamListComma', text: ','},
 // CHECK:STDOUT:             {kind: 'Name', text: 'c'},
 // CHECK:STDOUT:             {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:           {kind: 'ParameterListComma', text: ','},
+// CHECK:STDOUT:           {kind: 'ParamListComma', text: ','},
 // CHECK:STDOUT:             {kind: 'Name', text: 'd'},
 // CHECK:STDOUT:             {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:           {kind: 'ParameterListComma', text: ','},
+// CHECK:STDOUT:           {kind: 'ParamListComma', text: ','},
 // CHECK:STDOUT:             {kind: 'Name', text: 'e'},
 // CHECK:STDOUT:             {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:           {kind: 'ParameterListComma', text: ','},
+// CHECK:STDOUT:           {kind: 'ParamListComma', text: ','},
 // CHECK:STDOUT:             {kind: 'Name', text: 'f'},
 // CHECK:STDOUT:             {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 25},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 25},
 // CHECK:STDOUT:       {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 28},
 // CHECK:STDOUT:     {kind: 'InterfaceDefinition', text: '}', subtree_size: 29},
 // CHECK:STDOUT:     {kind: 'FileEnd', text: ''},

toolchain/parse/testdata/generics/params/two.carbon

@@ -13,27 +13,27 @@ interface Bar(a: i32, b: i32) {}
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:       {kind: 'ClassIntroducer', text: 'class'},
 // CHECK:STDOUT:       {kind: 'Name', text: 'Foo'},
-// CHECK:STDOUT:         {kind: 'ParameterListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamListStart', text: '('},
 // CHECK:STDOUT:           {kind: 'Name', text: 'a'},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterListComma', text: ','},
+// CHECK:STDOUT:         {kind: 'ParamListComma', text: ','},
 // CHECK:STDOUT:           {kind: 'Name', text: 'b'},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:       {kind: 'ParameterList', text: ')', subtree_size: 9},
+// CHECK:STDOUT:       {kind: 'ParamList', text: ')', subtree_size: 9},
 // CHECK:STDOUT:     {kind: 'ClassDecl', text: ';', subtree_size: 12},
 // CHECK:STDOUT:         {kind: 'InterfaceIntroducer', text: 'interface'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'Bar'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
 // CHECK:STDOUT:             {kind: 'Name', text: 'a'},
 // CHECK:STDOUT:             {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:           {kind: 'ParameterListComma', text: ','},
+// CHECK:STDOUT:           {kind: 'ParamListComma', text: ','},
 // CHECK:STDOUT:             {kind: 'Name', text: 'b'},
 // CHECK:STDOUT:             {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 9},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 9},
 // CHECK:STDOUT:       {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 12},
 // CHECK:STDOUT:     {kind: 'InterfaceDefinition', text: '}', subtree_size: 13},
 // CHECK:STDOUT:     {kind: 'FileEnd', text: ''},

toolchain/parse/testdata/generics/params/two_suffix_comma.carbon

@@ -13,29 +13,29 @@ interface Bar(a: i32, b: i32,) {}
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:       {kind: 'ClassIntroducer', text: 'class'},
 // CHECK:STDOUT:       {kind: 'Name', text: 'Foo'},
-// CHECK:STDOUT:         {kind: 'ParameterListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamListStart', text: '('},
 // CHECK:STDOUT:           {kind: 'Name', text: 'a'},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterListComma', text: ','},
+// CHECK:STDOUT:         {kind: 'ParamListComma', text: ','},
 // CHECK:STDOUT:           {kind: 'Name', text: 'b'},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterListComma', text: ','},
-// CHECK:STDOUT:       {kind: 'ParameterList', text: ')', subtree_size: 10},
+// CHECK:STDOUT:         {kind: 'ParamListComma', text: ','},
+// CHECK:STDOUT:       {kind: 'ParamList', text: ')', subtree_size: 10},
 // CHECK:STDOUT:     {kind: 'ClassDecl', text: ';', subtree_size: 13},
 // CHECK:STDOUT:         {kind: 'InterfaceIntroducer', text: 'interface'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'Bar'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
 // CHECK:STDOUT:             {kind: 'Name', text: 'a'},
 // CHECK:STDOUT:             {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:           {kind: 'ParameterListComma', text: ','},
+// CHECK:STDOUT:           {kind: 'ParamListComma', text: ','},
 // CHECK:STDOUT:             {kind: 'Name', text: 'b'},
 // CHECK:STDOUT:             {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:           {kind: 'ParameterListComma', text: ','},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 10},
+// CHECK:STDOUT:           {kind: 'ParamListComma', text: ','},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 10},
 // CHECK:STDOUT:       {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 13},
 // CHECK:STDOUT:     {kind: 'InterfaceDefinition', text: '}', subtree_size: 14},
 // CHECK:STDOUT:     {kind: 'FileEnd', text: ''},

toolchain/parse/testdata/if/basic.carbon

@@ -19,8 +19,8 @@ fn F() {
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'F'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
 // CHECK:STDOUT:           {kind: 'IfConditionStart', text: '('},
 // CHECK:STDOUT:           {kind: 'NameExpr', text: 'a'},

toolchain/parse/testdata/if/else.carbon

@@ -24,8 +24,8 @@ fn F() {
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'F'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
 // CHECK:STDOUT:           {kind: 'IfConditionStart', text: '('},
 // CHECK:STDOUT:           {kind: 'NameExpr', text: 'a'},

toolchain/parse/testdata/if/fail_else_unbraced.carbon

@@ -34,8 +34,8 @@ fn F() {
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'F'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
 // CHECK:STDOUT:           {kind: 'IfConditionStart', text: '('},
 // CHECK:STDOUT:           {kind: 'NameExpr', text: 'a'},

toolchain/parse/testdata/if/fail_errors.carbon

@@ -31,8 +31,8 @@ fn F() {
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'F'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
 // CHECK:STDOUT:           {kind: 'IfConditionStart', text: 'if', has_error: yes},
 // CHECK:STDOUT:           {kind: 'NameExpr', text: 'a'},

toolchain/parse/testdata/if/fail_missing_cond.carbon

@@ -17,8 +17,8 @@ fn F() {
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'F'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
 // CHECK:STDOUT:           {kind: 'IfConditionStart', text: 'if', has_error: yes},
 // CHECK:STDOUT:           {kind: 'InvalidParse', text: '{', has_error: yes},

toolchain/parse/testdata/if/fail_square_brackets.carbon

@@ -22,8 +22,8 @@ fn F() {
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'F'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
 // CHECK:STDOUT:           {kind: 'IfConditionStart', text: 'if', has_error: yes},
 // CHECK:STDOUT:               {kind: 'ArrayExprStart', text: '['},

toolchain/parse/testdata/if/fail_unbraced.carbon

@@ -26,8 +26,8 @@ fn F() {
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'F'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
 // CHECK:STDOUT:           {kind: 'IfConditionStart', text: '('},
 // CHECK:STDOUT:           {kind: 'NameExpr', text: 'a'},

toolchain/parse/testdata/if_expression/basic.carbon

@@ -13,19 +13,19 @@ fn F(b: bool, x: i32, y: i32) -> bool {
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'F'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
 // CHECK:STDOUT:             {kind: 'Name', text: 'b'},
 // CHECK:STDOUT:             {kind: 'Literal', text: 'bool'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:           {kind: 'ParameterListComma', text: ','},
+// CHECK:STDOUT:           {kind: 'ParamListComma', text: ','},
 // CHECK:STDOUT:             {kind: 'Name', text: 'x'},
 // CHECK:STDOUT:             {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:           {kind: 'ParameterListComma', text: ','},
+// CHECK:STDOUT:           {kind: 'ParamListComma', text: ','},
 // CHECK:STDOUT:             {kind: 'Name', text: 'y'},
 // CHECK:STDOUT:             {kind: 'Literal', text: 'i32'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 13},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 13},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'bool'},
 // CHECK:STDOUT:         {kind: 'ReturnType', text: '->', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 18},

toolchain/parse/testdata/if_expression/fail_condition_missing.carbon

@@ -16,8 +16,8 @@ fn F() {
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'F'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
 // CHECK:STDOUT:         {kind: 'VariableIntroducer', text: 'var'},
 // CHECK:STDOUT:           {kind: 'Name', text: 'n'},

toolchain/parse/testdata/if_expression/fail_else_expr_missing.carbon

@@ -16,8 +16,8 @@ fn F() {
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'F'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
 // CHECK:STDOUT:         {kind: 'VariableIntroducer', text: 'var'},
 // CHECK:STDOUT:           {kind: 'Name', text: 'n'},

toolchain/parse/testdata/if_expression/fail_else_missing.carbon

@@ -16,8 +16,8 @@ fn F() {
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'F'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
 // CHECK:STDOUT:         {kind: 'VariableIntroducer', text: 'var'},
 // CHECK:STDOUT:           {kind: 'Name', text: 'n'},

toolchain/parse/testdata/if_expression/fail_then_expr_missing.carbon

@@ -16,8 +16,8 @@ fn F() {
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'F'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
 // CHECK:STDOUT:         {kind: 'VariableIntroducer', text: 'var'},
 // CHECK:STDOUT:           {kind: 'Name', text: 'n'},

toolchain/parse/testdata/if_expression/fail_then_missing.carbon

@@ -16,8 +16,8 @@ fn F() {
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'F'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
 // CHECK:STDOUT:         {kind: 'VariableIntroducer', text: 'var'},
 // CHECK:STDOUT:           {kind: 'Name', text: 'n'},

toolchain/parse/testdata/if_expression/fail_top_level_if.carbon

@@ -22,8 +22,8 @@ fn F() {
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'F'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
 // CHECK:STDOUT:           {kind: 'IfConditionStart', text: 'if', has_error: yes},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'true'},

toolchain/parse/testdata/if_expression/in_type.carbon

@@ -20,8 +20,8 @@ fn F() -> if true then i32 else i32* {
 // CHECK:STDOUT:     {kind: 'VariableDecl', text: ';', subtree_size: 5},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'F'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:               {kind: 'Literal', text: 'true'},
 // CHECK:STDOUT:             {kind: 'IfExprIf', text: 'if', subtree_size: 2},
 // CHECK:STDOUT:               {kind: 'Literal', text: 'i32'},

toolchain/parse/testdata/if_expression/precedence.carbon

@@ -13,11 +13,11 @@ fn F(b: bool) -> bool {
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'F'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
 // CHECK:STDOUT:             {kind: 'Name', text: 'b'},
 // CHECK:STDOUT:             {kind: 'Literal', text: 'bool'},
 // CHECK:STDOUT:           {kind: 'PatternBinding', text: ':', subtree_size: 3},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 5},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 5},
 // CHECK:STDOUT:           {kind: 'Literal', text: 'bool'},
 // CHECK:STDOUT:         {kind: 'ReturnType', text: '->', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 10},

toolchain/parse/testdata/let/fail_missing_value.carbon

@@ -26,8 +26,8 @@ fn F() {
 // CHECK:STDOUT:     {kind: 'LetDecl', text: ';', has_error: yes, subtree_size: 5},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'F'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
 // CHECK:STDOUT:         {kind: 'LetIntroducer', text: 'let'},
 // CHECK:STDOUT:           {kind: 'Name', text: 'b'},

toolchain/parse/testdata/let/let.carbon

@@ -21,8 +21,8 @@ fn F() {
 // CHECK:STDOUT:     {kind: 'LetDecl', text: ';', subtree_size: 7},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'F'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
 // CHECK:STDOUT:         {kind: 'LetIntroducer', text: 'let'},
 // CHECK:STDOUT:           {kind: 'Name', text: 's'},

toolchain/parse/testdata/namespace/basic.carbon

@@ -18,8 +18,8 @@ fn Bar() {
 // CHECK:STDOUT:     {kind: 'Namespace', text: ';', subtree_size: 3},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'Bar'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
 // CHECK:STDOUT:               {kind: 'NameExpr', text: 'Foo'},
 // CHECK:STDOUT:               {kind: 'Name', text: 'Baz'},

toolchain/parse/testdata/namespace/nested.carbon

@@ -28,8 +28,8 @@ fn Foo.Bar.Baz() {
 // CHECK:STDOUT:           {kind: 'QualifiedDecl', text: '.', subtree_size: 3},
 // CHECK:STDOUT:           {kind: 'Name', text: 'Baz'},
 // CHECK:STDOUT:         {kind: 'QualifiedDecl', text: '.', subtree_size: 5},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 9},
 // CHECK:STDOUT:                 {kind: 'NameExpr', text: 'Foo'},
 // CHECK:STDOUT:                 {kind: 'Name', text: 'Bar'},

toolchain/parse/testdata/operators/assign.carbon

@@ -27,8 +27,8 @@ fn F() {
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:         {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:         {kind: 'Name', text: 'F'},
-// CHECK:STDOUT:           {kind: 'ParameterListStart', text: '('},
-// CHECK:STDOUT:         {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
 // CHECK:STDOUT:         {kind: 'VariableIntroducer', text: 'var'},
 // CHECK:STDOUT:           {kind: 'Name', text: 'a'},