diff --git a/toolchain/parser/parse_node_kind.def b/toolchain/parser/parse_node_kind.def
index 6667f48c1d4b..21df7a19aff3 100644
--- a/toolchain/parser/parse_node_kind.def
+++ b/toolchain/parser/parse_node_kind.def
@@ -338,10 +338,10 @@ CARBON_PARSE_NODE_KIND_BRACKET(NamedConstraintDeclaration,
                                NamedConstraintIntroducer)
 
 // The `self` name and `Self` type keywords. Typically of the form `self: Self`:
-//   SelfDeducedParameter
+//   SelfIdentifier
 //   SelfType
 // PatternBinding
-CARBON_PARSE_NODE_KIND_CHILD_COUNT(SelfDeducedParameter, 0)
+CARBON_PARSE_NODE_KIND_CHILD_COUNT(SelfIdentifier, 0)
 CARBON_PARSE_NODE_KIND_CHILD_COUNT(SelfType, 0)
 
 #undef CARBON_PARSE_NODE_KIND
diff --git a/toolchain/parser/parser.cpp b/toolchain/parser/parser.cpp
index 359a833fba62..4df10c88181e 100644
--- a/toolchain/parser/parser.cpp
+++ b/toolchain/parser/parser.cpp
@@ -948,6 +948,11 @@ auto Parser::HandleExpressionInPostfixState() -> void {
       PushState(ParserState::ParenExpression);
       break;
     }
+    case TokenKind::SelfParameter: {
+      AddLeafNode(ParseNodeKind::SelfIdentifier, Consume());
+      PushState(state);
+      break;
+    }
     case TokenKind::SelfType: {
       AddLeafNode(ParseNodeKind::SelfType, Consume());
       PushState(state);
@@ -1494,7 +1499,7 @@ auto Parser::HandlePattern(PatternKind pattern_kind) -> void {
     AddLeafNode(ParseNodeKind::DeclaredName, *identifier);
   } else if (pattern_kind == PatternKind::DeducedParameter) {
     if (auto self = ConsumeIf(TokenKind::SelfParameter)) {
-      AddLeafNode(ParseNodeKind::SelfDeducedParameter, *self);
+      AddLeafNode(ParseNodeKind::SelfIdentifier, *self);
     } else {
       on_error();
       return;
diff --git a/toolchain/parser/testdata/class/fn_definitions.carbon b/toolchain/parser/testdata/class/fn_definitions.carbon
new file mode 100644
index 000000000000..6ce3ae1fde32
--- /dev/null
+++ b/toolchain/parser/testdata/class/fn_definitions.carbon
@@ -0,0 +1,53 @@
+// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
+// Exceptions. See /LICENSE for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+// AUTOUPDATE
+// RUN: %{carbon-run-parser}
+// CHECK:STDOUT: [
+// CHECK:STDOUT:     {kind: 'ClassIntroducer', text: 'class'},
+// CHECK:STDOUT:     {kind: 'DeclaredName', text: 'Foo'},
+// CHECK:STDOUT:   {kind: 'ClassDefinitionStart', text: '{', subtree_size: 3},
+// CHECK:STDOUT:       {kind: 'FunctionIntroducer', text: 'fn'},
+// CHECK:STDOUT:       {kind: 'DeclaredName', text: 'Make'},
+// CHECK:STDOUT:         {kind: 'ParameterListStart', text: '('},
+// CHECK:STDOUT:       {kind: 'ParameterList', text: ')', subtree_size: 2},
+// CHECK:STDOUT:         {kind: 'SelfType', text: 'Self'},
+// CHECK:STDOUT:       {kind: 'ReturnType', text: '->', subtree_size: 2},
+// CHECK:STDOUT:     {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 7},
+// CHECK:STDOUT:       {kind: 'ReturnStatementStart', text: 'return'},
+// CHECK:STDOUT:         {kind: 'StructLiteralOrStructTypeLiteralStart', text: '{'},
+// CHECK:STDOUT:             {kind: 'DesignatedName', text: 'x'},
+// CHECK:STDOUT:           {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
+// CHECK:STDOUT:           {kind: 'Literal', text: '0'},
+// CHECK:STDOUT:         {kind: 'StructFieldValue', text: '=', subtree_size: 4},
+// CHECK:STDOUT:       {kind: 'StructLiteral', text: '}', subtree_size: 6},
+// CHECK:STDOUT:     {kind: 'ReturnStatement', text: ';', subtree_size: 8},
+// CHECK:STDOUT:   {kind: 'FunctionDefinition', text: '}', subtree_size: 16},
+// CHECK:STDOUT:       {kind: 'FunctionIntroducer', text: 'fn'},
+// CHECK:STDOUT:       {kind: 'DeclaredName', text: 'Baz'},
+// CHECK:STDOUT:         {kind: 'DeducedParameterListStart', text: '['},
+// CHECK:STDOUT:           {kind: 'SelfIdentifier', text: 'self'},
+// CHECK:STDOUT:           {kind: 'SelfType', text: 'Self'},
+// CHECK:STDOUT:         {kind: 'PatternBinding', text: ':', subtree_size: 3},
+// CHECK:STDOUT:       {kind: 'DeducedParameterList', text: ']', subtree_size: 5},
+// CHECK:STDOUT:         {kind: 'ParameterListStart', text: '('},
+// CHECK:STDOUT:       {kind: 'ParameterList', 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},
+// CHECK:STDOUT:       {kind: 'ReturnStatementStart', text: 'return'},
+// CHECK:STDOUT:         {kind: 'SelfIdentifier', text: 'self'},
+// CHECK:STDOUT:         {kind: 'DesignatedName', text: 'x'},
+// CHECK:STDOUT:       {kind: 'DesignatorExpression', text: '.', subtree_size: 3},
+// CHECK:STDOUT:     {kind: 'ReturnStatement', text: ';', subtree_size: 5},
+// CHECK:STDOUT:   {kind: 'FunctionDefinition', text: '}', subtree_size: 18},
+// CHECK:STDOUT: {kind: 'ClassDefinition', text: '}', subtree_size: 38},
+// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
+// CHECK:STDOUT: ]
+
+class Foo {
+  fn Make() -> Self { return {.x = 0}; }
+
+  fn Baz[self: Self]() -> i32 { return self.x; }
+}
diff --git a/toolchain/parser/testdata/class/var.carbon b/toolchain/parser/testdata/class/var.carbon
new file mode 100644
index 000000000000..dcbdf7ac8c91
--- /dev/null
+++ b/toolchain/parser/testdata/class/var.carbon
@@ -0,0 +1,22 @@
+// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
+// Exceptions. See /LICENSE for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+// AUTOUPDATE
+// RUN: %{carbon-run-parser}
+// CHECK:STDOUT: [
+// CHECK:STDOUT:     {kind: 'ClassIntroducer', text: 'class'},
+// CHECK:STDOUT:     {kind: 'DeclaredName', text: 'Foo'},
+// CHECK:STDOUT:   {kind: 'ClassDefinitionStart', text: '{', subtree_size: 3},
+// CHECK:STDOUT:     {kind: 'VariableIntroducer', text: 'var'},
+// CHECK:STDOUT:       {kind: 'DeclaredName', text: 'x'},
+// CHECK:STDOUT:       {kind: 'Literal', text: 'i32'},
+// CHECK:STDOUT:     {kind: 'PatternBinding', text: ':', subtree_size: 3},
+// CHECK:STDOUT:   {kind: 'VariableDeclaration', text: ';', subtree_size: 5},
+// CHECK:STDOUT: {kind: 'ClassDefinition', text: '}', subtree_size: 9},
+// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
+// CHECK:STDOUT: ]
+
+class Foo {
+  var x: i32;
+}
diff --git a/toolchain/parser/testdata/generics/interface/basic.carbon b/toolchain/parser/testdata/generics/interface/basic.carbon
index bb9fc4f05980..1162986ee5f1 100644
--- a/toolchain/parser/testdata/generics/interface/basic.carbon
+++ b/toolchain/parser/testdata/generics/interface/basic.carbon
@@ -11,7 +11,7 @@
 // CHECK:STDOUT:     {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:     {kind: 'DeclaredName', text: 'Add'},
 // CHECK:STDOUT:       {kind: 'DeducedParameterListStart', text: '['},
-// CHECK:STDOUT:         {kind: 'SelfDeducedParameter', text: 'self'},
+// CHECK:STDOUT:         {kind: 'SelfIdentifier', text: 'self'},
 // CHECK:STDOUT:         {kind: 'SelfType', text: 'Self'},
 // CHECK:STDOUT:       {kind: 'PatternBinding', text: ':', subtree_size: 3},
 // CHECK:STDOUT:     {kind: 'DeducedParameterList', text: ']', subtree_size: 5},
@@ -26,7 +26,7 @@
 // CHECK:STDOUT:     {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:     {kind: 'DeclaredName', text: 'Add'},
 // CHECK:STDOUT:       {kind: 'DeducedParameterListStart', text: '['},
-// CHECK:STDOUT:         {kind: 'SelfDeducedParameter', text: 'self'},
+// CHECK:STDOUT:         {kind: 'SelfIdentifier', text: 'self'},
 // CHECK:STDOUT:         {kind: 'NameReference', text: 'foo'},
 // CHECK:STDOUT:       {kind: 'PatternBinding', text: ':', subtree_size: 3},
 // CHECK:STDOUT:     {kind: 'DeducedParameterList', text: ']', subtree_size: 5},
diff --git a/toolchain/parser/testdata/generics/interface/fail_no_impl_allowed.carbon b/toolchain/parser/testdata/generics/interface/fail_no_impl_allowed.carbon
index 4ca80fe00dd6..439e46bc626f 100644
--- a/toolchain/parser/testdata/generics/interface/fail_no_impl_allowed.carbon
+++ b/toolchain/parser/testdata/generics/interface/fail_no_impl_allowed.carbon
@@ -11,7 +11,7 @@
 // CHECK:STDOUT:     {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:     {kind: 'DeclaredName', text: 'Add'},
 // CHECK:STDOUT:       {kind: 'DeducedParameterListStart', text: '['},
-// CHECK:STDOUT:         {kind: 'SelfDeducedParameter', text: 'self'},
+// CHECK:STDOUT:         {kind: 'SelfIdentifier', text: 'self'},
 // CHECK:STDOUT:         {kind: 'SelfType', text: 'Self'},
 // CHECK:STDOUT:       {kind: 'PatternBinding', text: ':', subtree_size: 3},
 // CHECK:STDOUT:     {kind: 'DeducedParameterList', text: ']', subtree_size: 5},
diff --git a/toolchain/parser/testdata/generics/interface/self_pointer.carbon b/toolchain/parser/testdata/generics/interface/self_pointer.carbon
index 71d09420cb26..c22846dabb9c 100644
--- a/toolchain/parser/testdata/generics/interface/self_pointer.carbon
+++ b/toolchain/parser/testdata/generics/interface/self_pointer.carbon
@@ -11,7 +11,7 @@
 // CHECK:STDOUT:     {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:     {kind: 'DeclaredName', text: 'Sub'},
 // CHECK:STDOUT:       {kind: 'DeducedParameterListStart', text: '['},
-// CHECK:STDOUT:           {kind: 'SelfDeducedParameter', text: 'self'},
+// CHECK:STDOUT:           {kind: 'SelfIdentifier', text: 'self'},
 // CHECK:STDOUT:             {kind: 'SelfType', text: 'Self'},
 // CHECK:STDOUT:           {kind: 'PostfixOperator', text: '*', subtree_size: 2},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: ':', subtree_size: 4},
@@ -28,7 +28,7 @@
 // CHECK:STDOUT:     {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:     {kind: 'DeclaredName', text: 'Sub'},
 // CHECK:STDOUT:       {kind: 'DeducedParameterListStart', text: '['},
-// CHECK:STDOUT:           {kind: 'SelfDeducedParameter', text: 'self'},
+// CHECK:STDOUT:           {kind: 'SelfIdentifier', text: 'self'},
 // CHECK:STDOUT:             {kind: 'NameReference', text: 'foo'},
 // CHECK:STDOUT:           {kind: 'PostfixOperator', text: '*', subtree_size: 2},
 // CHECK:STDOUT:         {kind: 'PatternBinding', text: ':', subtree_size: 4},
diff --git a/toolchain/parser/testdata/generics/named_constraint/fail_no_impl_allowed.carbon b/toolchain/parser/testdata/generics/named_constraint/fail_no_impl_allowed.carbon
index 8abd470c7947..af9e57ef76ce 100644
--- a/toolchain/parser/testdata/generics/named_constraint/fail_no_impl_allowed.carbon
+++ b/toolchain/parser/testdata/generics/named_constraint/fail_no_impl_allowed.carbon
@@ -11,7 +11,7 @@
 // CHECK:STDOUT:     {kind: 'FunctionIntroducer', text: 'fn'},
 // CHECK:STDOUT:     {kind: 'DeclaredName', text: 'Add'},
 // CHECK:STDOUT:       {kind: 'DeducedParameterListStart', text: '['},
-// CHECK:STDOUT:         {kind: 'SelfDeducedParameter', text: 'self'},
+// CHECK:STDOUT:         {kind: 'SelfIdentifier', text: 'self'},
 // CHECK:STDOUT:         {kind: 'SelfType', text: 'Self'},
 // CHECK:STDOUT:       {kind: 'PatternBinding', text: ':', subtree_size: 3},
 // CHECK:STDOUT:     {kind: 'DeducedParameterList', text: ']', subtree_size: 5},
diff --git a/toolchain/semantics/semantics_parse_tree_handler.cpp b/toolchain/semantics/semantics_parse_tree_handler.cpp
index 30c995252f22..51dc70cbfc76 100644
--- a/toolchain/semantics/semantics_parse_tree_handler.cpp
+++ b/toolchain/semantics/semantics_parse_tree_handler.cpp
@@ -922,9 +922,9 @@ auto SemanticsParseTreeHandler::HandleReturnType(ParseTree::Node parse_node)
   return true;
 }
 
-auto SemanticsParseTreeHandler::HandleSelfDeducedParameter(
-    ParseTree::Node parse_node) -> bool {
-  emitter_->Emit(parse_node, SemanticsTodo, "HandleSelfDeducedParameter");
+auto SemanticsParseTreeHandler::HandleSelfIdentifier(ParseTree::Node parse_node)
+    -> bool {
+  emitter_->Emit(parse_node, SemanticsTodo, "HandleSelfIdentifier");
   return false;
 }