diff --git a/common/fuzzing/carbon.proto b/common/fuzzing/carbon.proto
index 9bbb749fd4b1..37a25ad5487d 100644
--- a/common/fuzzing/carbon.proto
+++ b/common/fuzzing/carbon.proto
@@ -340,14 +340,14 @@ message ReturnTerm {
 message FunctionDeclaration {
   optional string name = 1;
   repeated GenericBinding deduced_parameters = 2;
-  optional Pattern me_pattern = 3;
+  optional Pattern self_pattern = 3;
   optional TuplePattern param_pattern = 4;
   optional ReturnTerm return_term = 5;
   optional BlockStatement body = 6;
 }
 
 message DestructorDeclaration {
-  optional Pattern me_pattern = 1;
+  optional Pattern self_pattern = 1;
   optional BlockStatement body = 2;
 }
 
diff --git a/common/fuzzing/proto_to_carbon.cpp b/common/fuzzing/proto_to_carbon.cpp
index fa09477362d9..5a4c53508535 100644
--- a/common/fuzzing/proto_to_carbon.cpp
+++ b/common/fuzzing/proto_to_carbon.cpp
@@ -686,10 +686,10 @@ static auto DeclarationToCarbon(const Fuzzing::Declaration& declaration,
       out << "destructor";
       llvm::ListSeparator sep;
       out << "[";
-      if (function.has_me_pattern()) {
+      if (function.has_self_pattern()) {
         // This is a class method.
         out << sep;
-        PatternToCarbon(function.me_pattern(), out);
+        PatternToCarbon(function.self_pattern(), out);
       }
       out << "]";
 
@@ -707,17 +707,18 @@ static auto DeclarationToCarbon(const Fuzzing::Declaration& declaration,
       out << "fn ";
       IdentifierToCarbon(function.name(), out);
 
-      if (!function.deduced_parameters().empty() || function.has_me_pattern()) {
+      if (!function.deduced_parameters().empty() ||
+          function.has_self_pattern()) {
         out << "[";
         llvm::ListSeparator sep;
         for (const Fuzzing::GenericBinding& p : function.deduced_parameters()) {
           out << sep;
           GenericBindingToCarbon(p, out);
         }
-        if (function.has_me_pattern()) {
+        if (function.has_self_pattern()) {
           // This is a class method.
           out << sep;
-          PatternToCarbon(function.me_pattern(), out);
+          PatternToCarbon(function.self_pattern(), out);
         }
         out << "]";
       }
diff --git a/docs/design/README.md b/docs/design/README.md
index f9333961dfaf..9905bb0f7efe 100644
--- a/docs/design/README.md
+++ b/docs/design/README.md
@@ -1668,22 +1668,22 @@ Class type definitions can include methods:
 ```carbon
 class Point {
   // Method defined inline
-  fn Distance[me: Self](x2: i32, y2: i32) -> f32 {
-    var dx: i32 = x2 - me.x;
-    var dy: i32 = y2 - me.y;
+  fn Distance[self: Self](x2: i32, y2: i32) -> f32 {
+    var dx: i32 = x2 - self.x;
+    var dy: i32 = y2 - self.y;
     return Math.Sqrt(dx * dx + dy * dy);
   }
   // Mutating method declaration
-  fn Offset[addr me: Self*](dx: i32, dy: i32);
+  fn Offset[addr self: Self*](dx: i32, dy: i32);
 
   var x: i32;
   var y: i32;
 }
 
 // Out-of-line definition of method declared inline
-fn Point.Offset[addr me: Self*](dx: i32, dy: i32) {
-  me->x += dx;
-  me->y += dy;
+fn Point.Offset[addr self: Self*](dx: i32, dy: i32) {
+  self->x += dx;
+  self->y += dy;
 }
 
 var origin: Point = {.x = 0, .y = 0};
@@ -1695,16 +1695,16 @@ Assert(origin.Distance(3, 4) == 0.0);
 This defines a `Point` class type with two integer data members `x` and `y` and
 two methods `Distance` and `Offset`:
 
--   Methods are defined as class functions with a `me` parameter inside square
+-   Methods are defined as class functions with a `self` parameter inside square
     brackets `[`...`]` before the regular explicit parameter list in parens
     `(`...`)`.
 -   Methods are called using the member syntax, `origin.Distance(`...`)` and
     `origin.Offset(`...`)`.
 -   `Distance` computes and returns the distance to another point, without
-    modifying the `Point`. This is signified using `[me: Self]` in the method
+    modifying the `Point`. This is signified using `[self: Self]` in the method
     declaration.
 -   `origin.Offset(`...`)` does modify the value of `origin`. This is signified
-    using `[addr me: Self*]` in the method declaration. Since calling this
+    using `[addr self: Self*]` in the method declaration. Since calling this
     method requires taking the address of `origin`, it may only be called on
     [non-`const`](#const) [l-values](#value-categories-and-value-phases).
 -   Methods may be declared lexically inline like `Distance`, or lexically out
@@ -1852,12 +1852,12 @@ names resolvable by the compiler, and don't act like forward declarations.
 
 A destructor for a class is custom code executed when the lifetime of a value of
 that type ends. They are defined with the `destructor` keyword followed by
-either `[me: Self]` or `[addr me: Self*]` (as is done with [methods](#methods))
-and the block of code in the class definition, as in:
+either `[self: Self]` or `[addr self: Self*]` (as is done with
+[methods](#methods)) and the block of code in the class definition, as in:
 
 ```carbon
 class MyClass {
-  destructor [me: Self] { ... }
+  destructor [self: Self] { ... }
 }
 ```
 
@@ -1865,8 +1865,8 @@ or:
 
 ```carbon
 class MyClass {
-  // Can modify `me` in the body.
-  destructor [addr me: Self*] { ... }
+  // Can modify `self` in the body.
+  destructor [addr self: Self*] { ... }
 }
 ```
 
@@ -1903,7 +1903,7 @@ For every type `MyClass`, there is the type `const MyClass` such that:
 -   If member `x` of `MyClass` has type `T`, then member `x` of `const MyClass`
     has type `const T`.
 -   The API of a `const MyClass` is a subset of `MyClass`, excluding all methods
-    taking `[addr me: Self*]`.
+    taking `[addr self: Self*]`.
 
 Note that `const` binds more tightly than postfix-`*` for forming a pointer
 type, so `const MyClass*` is equal to `(const MyClass)*`.
@@ -2662,7 +2662,7 @@ capabilities that may be assumed of types that satisfy that constraint.
 interface Printable {
   // Inside an interface definition `Self` means
   // "the type implementing this interface".
-  fn Print[me: Self]();
+  fn Print[self: Self]();
 }
 ```
 
@@ -2685,8 +2685,8 @@ class Circle {
   var radius: f32;
 
   impl as Printable {
-    fn Print[me: Self]() {
-      Carbon.Print("Circle with radius: {0}", me.radius);
+    fn Print[self: Self]() {
+      Carbon.Print("Circle with radius: {0}", self.radius);
     }
   }
 }
@@ -2779,9 +2779,9 @@ associated type to represent the type of elements stored in the stack.
 ```
 interface StackInterface {
   let ElementType:! Movable;
-  fn Push[addr me: Self*](value: ElementType);
-  fn Pop[addr me: Self*]() -> ElementType;
-  fn IsEmpty[addr me: Self*]() -> bool;
+  fn Push[addr self: Self*](value: ElementType);
+  fn Pop[addr self: Self*]() -> ElementType;
+  fn IsEmpty[addr self: Self*]() -> bool;
 }
 ```
 
@@ -2791,14 +2791,14 @@ values for the `ElementType` member of the interface using a `where` clause:
 ```carbon
 class IntStack {
   impl as StackInterface where .ElementType = i32 {
-    fn Push[addr me: Self*](value: i32);
+    fn Push[addr self: Self*](value: i32);
     // ...
   }
 }
 
 class FruitStack {
   impl as StackInterface where .ElementType = Fruit {
-    fn Push[addr me: Self*](value: Fruit);
+    fn Push[addr self: Self*](value: Fruit);
     // ...
   }
 }
@@ -2826,8 +2826,8 @@ type `T`:
 
 ```carbon
 class Stack(T:! Type) {
-  fn Push[addr me: Self*](value: T);
-  fn Pop[addr me: Self*]() -> T;
+  fn Push[addr self: Self*](value: T);
+  fn Pop[addr self: Self*]() -> T;
 
   var storage: Array(T);
 }
@@ -3032,7 +3032,7 @@ types in the `impl` declaration, as in:
 ```carbon
 external impl like T as AddWith(like U) where .Result = V {
   // `Self` is `T` here
-  fn Op[me: Self](other: U) -> V { ... }
+  fn Op[self: Self](other: U) -> V { ... }
 }
 ```
 
@@ -3041,7 +3041,7 @@ implementing the `Add` interface:
 
 ```carbon
 external impl T as Add {
-  fn Op[me: Self](other: Self) -> Self { ... }
+  fn Op[self: Self](other: Self) -> Self { ... }
 }
 ```
 
diff --git a/docs/design/classes.md b/docs/design/classes.md
index 80c548b7dd51..6f9bc6efdb4a 100644
--- a/docs/design/classes.md
+++ b/docs/design/classes.md
@@ -869,25 +869,25 @@ var p2: Point = p1.CreateCentered();
 
 [Method](<https://en.wikipedia.org/wiki/Method_(computer_programming)>)
 declarations are distinguished from [class function](#class-functions)
-declarations by having a `me` parameter in square brackets `[`...`]` before the
-explicit parameter list in parens `(`...`)`. There is no implicit member access
-in methods, so inside the method body members are accessed through the `me`
-parameter. Methods may be written lexically inline or after the class
+declarations by having a `self` parameter in square brackets `[`...`]` before
+the explicit parameter list in parens `(`...`)`. There is no implicit member
+access in methods, so inside the method body members are accessed through the
+`self` parameter. Methods may be written lexically inline or after the class
 declaration.
 
 ```carbon
 class Circle {
-  fn Diameter[me: Self]() -> f32 {
-    return me.radius * 2;
+  fn Diameter[self: Self]() -> f32 {
+    return self.radius * 2;
   }
-  fn Expand[addr me: Self*](distance: f32);
+  fn Expand[addr self: Self*](distance: f32);
 
   var center: Point;
   var radius: f32;
 }
 
-fn Circle.Expand[addr me: Self*](distance: f32) {
-  me->radius += distance;
+fn Circle.Expand[addr self: Self*](distance: f32) {
+  self->radius += distance;
 }
 
 var c: Circle = {.center = Point.Origin(), .radius = 1.5 };
@@ -899,10 +899,10 @@ Assert(Math.Abs(c.Diameter() - 4.0) < 0.001);
 -   Methods are called using the dot `.` member syntax, `c.Diameter()` and
     `c.Expand(`...`)`.
 -   `Diameter` computes and returns the diameter of the circle without modifying
-    the `Circle` instance. This is signified using `[me: Self]` in the method
+    the `Circle` instance. This is signified using `[self: Self]` in the method
     declaration.
 -   `c.Expand(`...`)` does modify the value of `c`. This is signified using
-    `[addr me: Self*]` in the method declaration.
+    `[addr self: Self*]` in the method declaration.
 
 The pattern '`addr` _patt_' means "first take the address of the argument, which
 must be an
@@ -911,8 +911,8 @@ then match pattern _patt_ against it".
 
 If the method declaration also includes
 [deduced generic parameters](/docs/design/generics/overview.md#deduced-parameters),
-the `me` parameter must be in the same list in square brackets `[`...`]`. The
-`me` parameter may appear in any position in that list, as long as it appears
+the `self` parameter must be in the same list in square brackets `[`...`]`. The
+`self` parameter may appear in any position in that list, as long as it appears
 after any names needed to describe its type.
 
 #### Deferred member function definitions
@@ -925,8 +925,8 @@ For example, given a class with inline function definitions:
 
 ```carbon
 class Point {
-  fn Distance[me: Self]() -> f32 {
-    return Math.Sqrt(me.x * me.x + me.y * me.y);
+  fn Distance[self: Self]() -> f32 {
+    return Math.Sqrt(self.x * self.x + self.y * self.y);
   }
 
   fn Create(x: f32, y: f32) -> Point {
@@ -942,15 +942,15 @@ These are all parsed as if they were defined outside the class scope:
 
 ```carbon
 class Point {
-  fn Distance[me: Self]() -> f32;
+  fn Distance[self: Self]() -> f32;
   fn Create(x: f32, y: f32) -> Point;
 
   var x: f32;
   var y: f32;
 }
 
-fn Point.Distance[me: Self]() -> f32 {
-  return Math.Sqrt(me.x * me.x + me.y * me.y);
+fn Point.Distance[self: Self]() -> f32 {
+  return Math.Sqrt(self.x * self.x + self.y * self.y);
 }
 
 fn Point.Create(x: f32, y: f32) -> Point {
@@ -971,27 +971,27 @@ For example:
 
 ```carbon
 class Square {
-  fn GetArea[me: Self]() -> f32 {
-    // ✅ OK: performs name lookup on `me`.
-    return me.size * me.size;
+  fn GetArea[self: Self]() -> f32 {
+    // ✅ OK: performs name lookup on `self`.
+    return self.size * self.size;
     // ❌ Error: finds `Square.size`, but an instance is required.
     return size * size;
     // ❌ Error: an instance is required.
     return Square.size * Square.size;
-    // ✅ OK: performs instance binding with `me`.
-    return me.(Square.size) * me.(Square.size);
+    // ✅ OK: performs instance binding with `self`.
+    return self.(Square.size) * self.(Square.size);
     // ✅ OK: uses unqualified name lookup to find `Square.size`, then performs
-    // instance binding with `me`.
-    return me.(size) * me.(size);
+    // instance binding with `self`.
+    return self.(size) * self.(size);
   }
 
-  fn GetDoubled[me: Self]() -> Square {
+  fn GetDoubled[self: Self]() -> Square {
     // ✅ OK: performs name lookup on `Square` for `Create`.
-    return Square.Create(me.size);
+    return Square.Create(self.size);
     // ✅ OK: performs unqualified name lookup within class scope for `Create`.
-    return Create(me.size);
-    // ✅ OK: performs name lookup on `me` for `Create`.
-    return me.Create(me.size);
+    return Create(self.size);
+    // ✅ OK: performs name lookup on `self` for `Create`.
+    return self.Create(self.size);
   }
 
   fn Create(size: f32) -> Square;
@@ -1182,7 +1182,7 @@ declaration before `fn`.
 
 ```
 base class MyBaseClass {
-  virtual fn Overridable[me: Self]() -> i32 { return 7; }
+  virtual fn Overridable[self: Self]() -> i32 { return 7; }
 }
 ```
 
@@ -1259,26 +1259,26 @@ class ExactlyExtensible extends ExtensibleBase { ... }
 Note that `Self` in a class definition means "the current type being defined"
 not "the type implementing this method." To implement a method in a derived
 class that uses `Self` in the declaration in the base class, only the type of
-`me` should change:
+`self` should change:
 
 ```
 base class B1 {
-  virtual fn F[me: Self](x: Self) -> Self;
+  virtual fn F[self: Self](x: Self) -> Self;
   // Means exactly the same thing as:
-  //   virtual fn F[me: B1](x: B1) -> B1;
+  //   virtual fn F[self: B1](x: B1) -> B1;
 }
 
 class D1 extends B1 {
   // ❌ Illegal:
-  //   impl fn F[me: Self](x: Self) -> Self;
+  //   impl fn F[self: Self](x: Self) -> Self;
   // since that would mean the same thing as:
-  //   impl fn F[me: Self](x: D1) -> D1;
+  //   impl fn F[self: Self](x: D1) -> D1;
   // and `D1` is a different type than `B1`.
 
   // ✅ Allowed: Parameter and return types
   //  of `F` match declaration in `B1`.
-  impl fn F[me: Self](x: B1) -> B1;
-  // Or: impl fn F[me: D1](x: B1) -> B1;
+  impl fn F[self: Self](x: B1) -> B1;
+  // Or: impl fn F[self: D1](x: B1) -> B1;
 }
 ```
 
@@ -1288,16 +1288,16 @@ calling the derived implementation, as in:
 
 ```
 base class B2 {
-  virtual fn Clone[me: Self]() -> Self*;
+  virtual fn Clone[self: Self]() -> Self*;
   // Means exactly the same thing as:
-  //   virtual fn Clone[me: B2]() -> B2*;
+  //   virtual fn Clone[self: B2]() -> B2*;
 }
 
 class D2 extends B2 {
   // ✅ Allowed
-  impl fn Clone[me: Self]() -> Self*;
+  impl fn Clone[self: Self]() -> Self*;
   // Means the same thing as:
-  //   impl fn Clone[me: D2]() -> D2*;
+  //   impl fn Clone[self: D2]() -> D2*;
   // which is allowed since `D2*` is a
   // subtype of `B2*`.
 }
@@ -1522,7 +1522,7 @@ the `destructor` keyword:
 
 ```carbon
 class MyClass {
-  destructor [me: Self] { ... }
+  destructor [self: Self] { ... }
 }
 ```
 
@@ -1530,13 +1530,13 @@ or:
 
 ```carbon
 class MyClass {
-  // Can modify `me` in the body.
-  destructor [addr me: Self*] { ... }
+  // Can modify `self` in the body.
+  destructor [addr self: Self*] { ... }
 }
 ```
 
 If a class has no `destructor` declaration, it gets the default destructor,
-which is equivalent to `destructor [me: Self] { }`.
+which is equivalent to `destructor [self: Self] { }`.
 
 The destructor for a class is run before the destructors of its data members.
 The data members are destroyed in reverse order of declaration. Derived classes
@@ -1554,9 +1554,9 @@ Destructors may be declared in class scope and then defined out-of-line:
 
 ```carbon
 class MyClass {
-  destructor [addr me: Self*];
+  destructor [addr self: Self*];
 }
-destructor MyClass [addr me: Self*] { ... }
+destructor MyClass [addr self: Self*] { ... }
 ```
 
 It is illegal to delete an instance of a derived class through a pointer to one
@@ -1568,11 +1568,11 @@ must be `impl`:
 
 ```carbon
 base class MyBaseClass {
-  virtual destructor [addr me: Self*] { ... }
+  virtual destructor [addr self: Self*] { ... }
 }
 
 class MyDerivedClass extends MyBaseClass {
-  impl destructor [addr me: Self*] { ... }
+  impl destructor [addr self: Self*] { ... }
 }
 ```
 
@@ -1622,8 +1622,8 @@ call the `UnsafeDelete` method instead. Note that you may not call
 ```
 interface Allocator {
   // ...
-  fn Delete[T:! Deletable, addr me: Self*](p: T*);
-  fn UnsafeDelete[T:! Destructible, addr me: Self*](p: T*);
+  fn Delete[T:! Deletable, addr self: Self*](p: T*);
+  fn UnsafeDelete[T:! Destructible, addr self: Self*](p: T*);
 }
 ```
 
@@ -1670,7 +1670,7 @@ could potentially fail must be performed before the destructor is called.
 Unhandled failure during a destructor call will abort the program.
 
 **Future work:** Allow or require destructors to be declared as taking
-`[var me: Self]`.
+`[var self: Self]`.
 
 **Alternatives considered:**
 
@@ -1734,7 +1734,7 @@ As in C++, `private` means only accessible to members of the class and any
 
 ```carbon
 class Point {
-  fn Distance[me: Self]() -> f32;
+  fn Distance[self: Self]() -> f32;
   // These are only accessible to members of `Point`.
   private var x: f32;
   private var y: f32;
@@ -1772,15 +1772,15 @@ derived classes, and any [friends](#friends).
 ```
 base class MyBaseClass {
   protected fn HelperClassFunction(x: i32) -> i32;
-  protected fn HelperMethod[me: Self](x: i32) -> i32;
+  protected fn HelperMethod[self: Self](x: i32) -> i32;
   protected var data: i32;
 }
 
 class MyDerivedClass extends MyBaseClass {
-  fn UsesProtected[addr me: Self*]() {
+  fn UsesProtected[addr self: Self*]() {
     // Can access protected members in derived class
     var x: i32 = HelperClassFunction(3);
-    me->data = me->HelperMethod(x);
+    self->data = self->HelperMethod(x);
   }
 }
 ```
diff --git a/docs/design/expressions/README.md b/docs/design/expressions/README.md
index 3603f2dfc493..cae8c4eb058e 100644
--- a/docs/design/expressions/README.md
+++ b/docs/design/expressions/README.md
@@ -232,9 +232,9 @@ with parentheses around the member name:
 -   _expression_ `.` `(` _expression_ `)`
 
 ```
-interface I { fn F[me: Self](); }
+interface I { fn F[self: Self](); }
 class X {}
-external impl X as I { fn F[me: Self]() {} }
+external impl X as I { fn F[self: Self]() {} }
 
 // `x.I.F()` would mean `(x.I).F()`.
 fn Q(x: X) { x.(I.F)(); }
diff --git a/docs/design/expressions/arithmetic.md b/docs/design/expressions/arithmetic.md
index 6b3d2fcb395e..ea05a9185969 100644
--- a/docs/design/expressions/arithmetic.md
+++ b/docs/design/expressions/arithmetic.md
@@ -194,7 +194,7 @@ following family of interfaces:
 // Unary `-`.
 interface Negate {
   let Result:! Type = Self;
-  fn Op[me: Self]() -> Result;
+  fn Op[self: Self]() -> Result;
 }
 ```
 
@@ -202,7 +202,7 @@ interface Negate {
 // Binary `+`.
 interface AddWith(U:! Type) {
   let Result:! Type = Self;
-  fn Op[me: Self](other: U) -> Result;
+  fn Op[self: Self](other: U) -> Result;
 }
 constraint Add {
   extends AddWith(Self) where .Result = Self;
@@ -213,7 +213,7 @@ constraint Add {
 // Binary `-`.
 interface SubWith(U:! Type) {
   let Result:! Type = Self;
-  fn Op[me: Self](other: U) -> Result;
+  fn Op[self: Self](other: U) -> Result;
 }
 constraint Sub {
   extends SubWith(Self) where .Result = Self;
@@ -224,7 +224,7 @@ constraint Sub {
 // Binary `*`.
 interface MulWith(U:! Type) {
   let Result:! Type = Self;
-  fn Op[me: Self](other: U) -> Result;
+  fn Op[self: Self](other: U) -> Result;
 }
 constraint Mul {
   extends MulWith(Self) where .Result = Self;
@@ -235,7 +235,7 @@ constraint Mul {
 // Binary `/`.
 interface DivWith(U:! Type) {
   let Result:! Type = Self;
-  fn Op[me: Self](other: U) -> Result;
+  fn Op[self: Self](other: U) -> Result;
 }
 constraint Div {
   extends DivWith(Self) where .Result = Self;
@@ -246,7 +246,7 @@ constraint Div {
 // Binary `%`.
 interface ModWith(U:! Type) {
   let Result:! Type = Self;
-  fn Op[me: Self](other: U) -> Result;
+  fn Op[self: Self](other: U) -> Result;
 }
 constraint Mod {
   extends ModWith(Self) where .Result = Self;
diff --git a/docs/design/expressions/as_expressions.md b/docs/design/expressions/as_expressions.md
index fb6ffc301f7e..83cefe77a581 100644
--- a/docs/design/expressions/as_expressions.md
+++ b/docs/design/expressions/as_expressions.md
@@ -165,7 +165,7 @@ Explicit casts can be defined for user-defined types such as
 
 ```
 interface As(Dest:! Type) {
-  fn Convert[me: Self]() -> Dest;
+  fn Convert[self: Self]() -> Dest;
 }
 ```
 
diff --git a/docs/design/expressions/bitwise.md b/docs/design/expressions/bitwise.md
index 2300cc557fb3..849cdff52313 100644
--- a/docs/design/expressions/bitwise.md
+++ b/docs/design/expressions/bitwise.md
@@ -198,7 +198,7 @@ implementing the following family of interfaces:
 // Unary `^`.
 interface BitComplement {
   let Result:! Type = Self;
-  fn Op[me: Self]() -> Result;
+  fn Op[self: Self]() -> Result;
 }
 ```
 
@@ -206,7 +206,7 @@ interface BitComplement {
 // Binary `&`.
 interface BitAndWith(U:! Type) {
   let Result:! Type = Self;
-  fn Op[me: Self](other: U) -> Result;
+  fn Op[self: Self](other: U) -> Result;
 }
 constraint BitAnd {
   extends BitAndWith(Self) where .Result = Self;
@@ -217,7 +217,7 @@ constraint BitAnd {
 // Binary `|`.
 interface BitOrWith(U:! Type) {
   let Result:! Type = Self;
-  fn Op[me: Self](other: U) -> Result;
+  fn Op[self: Self](other: U) -> Result;
 }
 constraint BitOr {
   extends BitOrWith(Self) where .Result = Self;
@@ -228,7 +228,7 @@ constraint BitOr {
 // Binary `^`.
 interface BitXorWith(U:! Type) {
   let Result:! Type = Self;
-  fn Op[me: Self](other: U) -> Result;
+  fn Op[self: Self](other: U) -> Result;
 }
 constraint BitXor {
   extends BitXorWith(Self) where .Result = Self;
@@ -239,7 +239,7 @@ constraint BitXor {
 // Binary `<<`.
 interface LeftShiftWith(U:! Type) {
   let Result:! Type = Self;
-  fn Op[me: Self](other: U) -> Result;
+  fn Op[self: Self](other: U) -> Result;
 }
 constraint LeftShift {
   extends LeftShiftWith(Self) where .Result = Self;
@@ -250,7 +250,7 @@ constraint LeftShift {
 // Binary `>>`.
 interface RightShiftWith(U:! Type) {
   let Result:! Type = Self;
-  fn Op[me: Self](other: U) -> Result;
+  fn Op[self: Self](other: U) -> Result;
 }
 constraint RightShift {
   extends RightShiftWith(Self) where .Result = Self;
diff --git a/docs/design/expressions/comparison_operators.md b/docs/design/expressions/comparison_operators.md
index 4836922bef1b..42c2ee571e9a 100644
--- a/docs/design/expressions/comparison_operators.md
+++ b/docs/design/expressions/comparison_operators.md
@@ -254,9 +254,9 @@ operators for a given pair of types:
 
 ```
 interface EqWith(U:! Type) {
-  fn Equal[me: Self](u: U) -> bool;
-  default fn NotEqual[me: Self](u: U) -> bool {
-    return not (me == u);
+  fn Equal[self: Self](u: U) -> bool;
+  default fn NotEqual[self: Self](u: U) -> bool {
+    return not (self == u);
   }
 }
 constraint Eq {
@@ -273,11 +273,11 @@ Given `x: T` and `y: U`:
 class Path {
   private var drive: String;
   private var path: String;
-  private fn CanonicalPath[me: Self]() -> String;
+  private fn CanonicalPath[self: Self]() -> String;
 
   external impl as Eq {
-    fn Equal[me: Self](other: Self) -> bool {
-      return (me.drive, me.CanonicalPath()) ==
+    fn Equal[self: Self](other: Self) -> bool {
+      return (self.drive, self.CanonicalPath()) ==
              (other.drive, other.CanonicalPath());
     }
   }
@@ -293,12 +293,12 @@ can be used:
 ```
 class MyInt {
   var value: i32;
-  fn Value[me: Self]() -> i32 { return me.value; }
+  fn Value[self: Self]() -> i32 { return self.value; }
 }
 external impl i32 as ImplicitAs(MyInt);
 external impl like MyInt as EqWith(like MyInt) {
-  fn Equal[me: Self](other: Self) -> bool {
-    return me.Value() == other.Value();
+  fn Equal[self: Self](other: Self) -> bool {
+    return self.Value() == other.Value();
   }
 }
 fn CompareBothWays(a: MyInt, b: i32, c: MyInt) -> bool {
@@ -316,17 +316,17 @@ operations should have no observable side-effects.
 
 ```
 external impl like MyFloat as EqWith(like MyFloat) {
-  fn Equal[me: MyFloat](other: MyFloat) -> bool {
-    if (me.IsNaN() or other.IsNaN()) {
+  fn Equal[self: MyFloat](other: MyFloat) -> bool {
+    if (self.IsNaN() or other.IsNaN()) {
       return false;
     }
-    return me.Representation() == other.Representation();
+    return self.Representation() == other.Representation();
   }
-  fn NotEqual[me: MyFloat](other: MyFloat) -> bool {
-    if (me.IsNaN() or other.IsNaN()) {
+  fn NotEqual[self: MyFloat](other: MyFloat) -> bool {
+    if (self.IsNaN() or other.IsNaN()) {
       return false;
     }
-    return me.Representation() != other.Representation();
+    return self.Representation() != other.Representation();
   }
 }
 ```
@@ -354,19 +354,19 @@ choice Ordering {
   Incomparable
 }
 interface OrderedWith(U:! Type) {
-  fn Compare[me: Self](u: U) -> Ordering;
-  default fn Less[me: Self](u: U) -> bool {
-    return me.Compare(u) == Ordering.Less;
+  fn Compare[self: Self](u: U) -> Ordering;
+  default fn Less[self: Self](u: U) -> bool {
+    return self.Compare(u) == Ordering.Less;
   }
-  default fn LessOrEquivalent[me: Self](u: U) -> bool {
-    let c: Ordering = me.Compare(u);
+  default fn LessOrEquivalent[self: Self](u: U) -> bool {
+    let c: Ordering = self.Compare(u);
     return c == Ordering.Less or c == Ordering.Equivalent;
   }
-  default fn Greater[me: Self](u: U) -> bool {
-    return me.Compare(u) == Ordering.Greater;
+  default fn Greater[self: Self](u: U) -> bool {
+    return self.Compare(u) == Ordering.Greater;
   }
-  default fn GreaterOrEquivalent[me: Self](u: U) -> bool {
-    let c: Ordering = me.Compare(u);
+  default fn GreaterOrEquivalent[self: Self](u: U) -> bool {
+    let c: Ordering = self.Compare(u);
     return c == Ordering.Greater or c == Ordering.Equivalent;
   }
 }
@@ -395,12 +395,12 @@ class MyWidget {
   var width: i32;
   var height: i32;
 
-  fn Size[me: Self]() -> i32 { return me.width * me.height; }
+  fn Size[self: Self]() -> i32 { return self.width * self.height; }
 
   // Widgets are normally ordered by size.
   external impl as Ordered {
-    fn Compare[me: Self](other: Self) -> Ordering {
-      return me.Size().(Ordered.Compare)(other.Size());
+    fn Compare[self: Self](other: Self) -> Ordering {
+      return self.Size().(Ordered.Compare)(other.Size());
     }
   }
 }
@@ -420,8 +420,8 @@ fn ReverseOrdering(o: Ordering) -> Ordering {
 }
 external impl like MyInt as OrderedWith(like MyFloat);
 external impl like MyFloat as OrderedWith(like MyInt) {
-  fn Compare[me: Self](other: Self) -> Ordering {
-    return Reverse(other.(OrderedWith(Self).Compare)(me));
+  fn Compare[self: Self](other: Self) -> Ordering {
+    return Reverse(other.(OrderedWith(Self).Compare)(self));
   }
 }
 ```
diff --git a/docs/design/expressions/implicit_conversions.md b/docs/design/expressions/implicit_conversions.md
index f906b1ce570e..8b4bbf497b0b 100644
--- a/docs/design/expressions/implicit_conversions.md
+++ b/docs/design/expressions/implicit_conversions.md
@@ -210,7 +210,7 @@ extends
 interface ImplicitAs(Dest:! Type) {
   extends As(Dest);
   // Inherited from As(Dest):
-  // fn Convert[me: Self]() -> Dest;
+  // fn Convert[self: Self]() -> Dest;
 }
 ```
 
diff --git a/docs/design/expressions/member_access.md b/docs/design/expressions/member_access.md
index 656800186180..a5a71b7d02d9 100644
--- a/docs/design/expressions/member_access.md
+++ b/docs/design/expressions/member_access.md
@@ -55,7 +55,7 @@ For example:
 ```carbon
 package Widgets api;
 interface Widget {
-  fn Grow[addr me: Self*](factor: f64);
+  fn Grow[addr self: Self*](factor: f64);
 }
 class Cog {
   var size: i32;
@@ -163,7 +163,7 @@ For example:
 
 ```
 interface Printable {
-  fn Print[me: Self]();
+  fn Print[self: Self]();
 }
 external impl i32 as Printable;
 class Point {
@@ -238,11 +238,11 @@ actual value of a generic parameter never affects the result of member
 resolution.
 
 ```carbon
-class Cowboy { fn Draw[me: Self](); }
+class Cowboy { fn Draw[self: Self](); }
 interface Renderable {
-  fn Draw[me: Self]();
+  fn Draw[self: Self]();
 }
-external impl Cowboy as Renderable { fn Draw[me: Self](); }
+external impl Cowboy as Renderable { fn Draw[self: Self](); }
 fn DrawDirect(c: Cowboy) { c.Draw(); }
 fn DrawGeneric[T:! Renderable](c: T) { c.Draw(); }
 fn DrawTemplate[template T:! Renderable](c: T) { c.Draw(); }
@@ -258,13 +258,13 @@ fn Draw(c: Cowboy) {
 
 class RoundWidget {
   external impl as Renderable {
-    fn Draw[me: Self]();
+    fn Draw[self: Self]();
   }
   alias Draw = Renderable.Draw;
 }
 
 class SquareWidget {
-  fn Draw[me: Self]() {}
+  fn Draw[self: Self]() {}
   external impl as Renderable {
     alias Draw = Self.Draw;
   }
@@ -303,7 +303,7 @@ expression.
 ```carbon
 interface Addable {
   // #1
-  fn Add[me: Self](other: Self) -> Self;
+  fn Add[self: Self](other: Self) -> Self;
   // #2
   default fn Sum[Seq:! Iterable where .ValueType = Self](seq: Seq) -> Self {
     // ...
@@ -313,7 +313,7 @@ interface Addable {
 class Integer {
   impl as Addable {
     // #3
-    fn Add[me: Self](other: Self) -> Self;
+    fn Add[self: Self](other: Self) -> Self;
     // #4, generated from default implementation for #2.
     // fn Sum[...](...);
   }
@@ -368,13 +368,13 @@ the argument for the template parameter is known.
 ```carbon
 interface I {
   // #1
-  default fn F[me: Self]() {}
+  default fn F[self: Self]() {}
   let N:! i32;
 }
 class C {
   impl as I where .N = 5 {
     // #2
-    fn F[me: C]() {}
+    fn F[self: C]() {}
   }
 }
 
@@ -413,13 +413,13 @@ naming the interface member as a member of the class.
 ```carbon
 interface Renderable {
   // #1
-  fn Draw[me: Self]();
+  fn Draw[self: Self]();
 }
 
 class RoundWidget {
   external impl as Renderable {
     // #2
-    fn Draw[me: Self]();
+    fn Draw[self: Self]();
   }
   // `Draw` names the member of the `Renderable` interface.
   alias Draw = Renderable.Draw;
@@ -427,7 +427,7 @@ class RoundWidget {
 
 class SquareWidget {
   // #3
-  fn Draw[me: Self]() {}
+  fn Draw[self: Self]() {}
   external impl as Renderable {
     alias Draw = Self.Draw;
   }
@@ -450,14 +450,14 @@ fn DrawWidget(r: RoundWidget, s: SquareWidget) {
   // ❌ Error: In the inner member access, the name `Draw` resolves to the
   // member `Draw` of `SquareWidget`, #3.
   // The outer member access fails because we can't call
-  // #3, `Draw[me: SquareWidget]()`, on a `RoundWidget` object `r`.
+  // #3, `Draw[self: SquareWidget]()`, on a `RoundWidget` object `r`.
   r.(SquareWidget.Draw)();
 
   // ❌ Error: In the inner member access, the name `Draw` resolves to the
   // member `Draw` of `Renderable`, #1, which `impl` lookup replaces with
   // the member `Draw` of `impl RoundWidget as Renderable`, #2.
   // The outer member access fails because we can't call
-  // #2, `Draw[me: RoundWidget]()`, on a `SquareWidget` object `s`.
+  // #2, `Draw[self: RoundWidget]()`, on a `SquareWidget` object `s`.
   s.(RoundWidget.Draw)();
 }
 
@@ -511,19 +511,19 @@ value other than a type, then _instance binding_ is performed, as follows:
 
 -   For a method, the result is a _bound method_, which is a value `F` such that
     a function call `F(args)` behaves the same as a call to `M(args)` with the
-    `me` parameter initialized by a corresponding recipient argument:
+    `self` parameter initialized by a corresponding recipient argument:
 
-    -   If the method declares its `me` parameter with `addr`, the recipient
+    -   If the method declares its `self` parameter with `addr`, the recipient
         argument is `&V`.
     -   Otherwise, the recipient argument is `V`.
 
     ```carbon
     class Blob {
-      fn Mutate[addr me: Self*](n: i32);
+      fn Mutate[addr self: Self*](n: i32);
     }
     fn F(p: Blob*) {
       // ✅ OK, forms bound method `((*p).M)` and calls it.
-      // This calls `Blob.Mutate` with `me` initialized by `&(*p)`
+      // This calls `Blob.Mutate` with `self` initialized by `&(*p)`
       // and `n` initialized by `5`.
       (*p).Mutate(5);
 
@@ -580,10 +580,10 @@ always used for lookup.
 
 ```
 interface Printable {
-  fn Print[me: Self]();
+  fn Print[self: Self]();
 }
 external impl i32 as Printable {
-  fn Print[me: Self]();
+  fn Print[self: Self]();
 }
 fn MemberAccess(n: i32) {
   // ✅ OK: `Printable.Print` is the interface member.
diff --git a/docs/design/generics/appendix-coherence.md b/docs/design/generics/appendix-coherence.md
index 475a794de867..6ccd10b87067 100644
--- a/docs/design/generics/appendix-coherence.md
+++ b/docs/design/generics/appendix-coherence.md
@@ -78,7 +78,7 @@ this:
     package SongHashArtistAndTitle;
     import SongLib;
     impl SongLib.Song as Hashable {
-      fn Hash[me: Self]() -> u64 { ... }
+      fn Hash[self: Self]() -> u64 { ... }
     }
     ```
 
@@ -105,7 +105,7 @@ this:
     package SongHashAppleMusicURL;
     import SongLib;
     impl SongLib.Song as Hashable {
-      fn Hash[me: Self]() -> u64 { ... }
+      fn Hash[self: Self]() -> u64 { ... }
     }
     ```
 
diff --git a/docs/design/generics/details.md b/docs/design/generics/details.md
index f26390322f82..8352fd915b29 100644
--- a/docs/design/generics/details.md
+++ b/docs/design/generics/details.md
@@ -226,8 +226,8 @@ have two methods:
 interface Vector {
   // Here the `Self` keyword means
   // "the type implementing this interface".
-  fn Add[me: Self](b: Self) -> Self;
-  fn Scale[me: Self](v: f64) -> Self;
+  fn Add[self: Self](b: Self) -> Self;
+  fn Scale[self: Self](v: f64) -> Self;
 }
 ```
 
@@ -261,10 +261,10 @@ class Point {
   impl as Vector {
     // In this scope, the `Self` keyword is an
     // alias for `Point`.
-    fn Add[me: Self](b: Self) -> Self {
+    fn Add[self: Self](b: Self) -> Self {
       return {.x = a.x + b.x, .y = a.y + b.y};
     }
-    fn Scale[me: Self](v: f64) -> Self {
+    fn Scale[self: Self](v: f64) -> Self {
       return {.x = a.x * v, .y = a.y * v};
     }
   }
@@ -305,11 +305,11 @@ class Point {
   var x: f64;
   var y: f64;
   impl as Vector {
-    fn Add[me: Self](b: Self) -> Self { ... }
-    fn Scale[me: Self](v: f64) -> Self { ... }
+    fn Add[self: Self](b: Self) -> Self { ... }
+    fn Scale[self: Self](v: f64) -> Self { ... }
   }
   impl as Drawable {
-    fn Draw[me: Self]() { ... }
+    fn Draw[self: Self]() { ... }
   }
 }
 ```
@@ -322,13 +322,13 @@ below).
 ```
 class GameBoard {
   impl as Drawable {
-    fn Draw[me: Self]() { ... }
+    fn Draw[self: Self]() { ... }
   }
   impl as EndOfGame {
     // ❌ Error: `GameBoard` has two methods named
     // `Draw` with the same signature.
-    fn Draw[me: Self]() { ... }
-    fn Winner[me: Self](player: i32) { ... }
+    fn Draw[self: Self]() { ... }
+    fn Winner[self: Self](player: i32) { ... }
   }
 }
 ```
@@ -342,14 +342,14 @@ experience.
 class Player {
   var name: String;
   impl as Icon {
-    fn Name[me: Self]() -> String { return me.name; }
+    fn Name[self: Self]() -> String { return self.name; }
     // ...
   }
   impl as GameUnit {
     // Possible syntax options for defining
     // `GameUnit.Name` as the same as `Icon.Name`:
     alias Name = Icon.Name;
-    fn Name[me: Self]() -> String = Icon.Name;
+    fn Name[self: Self]() -> String = Icon.Name;
     // ...
   }
 }
@@ -369,10 +369,10 @@ class Point2 {
   external impl as Vector {
     // In this scope, the `Self` keyword is an
     // alias for `Point2`.
-    fn Add[me: Self](b: Self) -> Self {
+    fn Add[self: Self](b: Self) -> Self {
       return {.x = a.x + b.x, .y = a.y + b.y};
     }
-    fn Scale[me: Self](v: f64) -> Self {
+    fn Scale[self: Self](v: f64) -> Self {
       return {.x = a.x * v, .y = a.y * v};
     }
   }
@@ -395,10 +395,10 @@ class Point3 {
 external impl Point3 as Vector {
   // In this scope, the `Self` keyword is an
   // alias for `Point3`.
-  fn Add[me: Self](b: Self) -> Self {
+  fn Add[self: Self](b: Self) -> Self {
     return {.x = a.x + b.x, .y = a.y + b.y};
   }
-  fn Scale[me: Self](v: f64) -> Self {
+  fn Scale[self: Self](v: f64) -> Self {
     return {.x = a.x * v, .y = a.y * v};
   }
 }
@@ -440,13 +440,13 @@ scope.
 class Point4a {
   var x: f64;
   var y: f64;
-  fn Add[me: Self](b: Self) -> Self {
-    return {.x = me.x + b.x, .y = me.y + b.y};
+  fn Add[self: Self](b: Self) -> Self {
+    return {.x = self.x + b.x, .y = self.y + b.y};
   }
   external impl as Vector {
     alias Add = Point4a.Add;  // Syntax TBD
-    fn Scale[me: Self](v: f64) -> Self {
-      return {.x = me.x * v, .y = me.y * v};
+    fn Scale[self: Self](v: f64) -> Self {
+      return {.x = self.x * v, .y = self.y * v};
     }
   }
 }
@@ -457,11 +457,11 @@ class Point4b {
   var x: f64;
   var y: f64;
   external impl as Vector {
-    fn Add[me: Self](b: Self) -> Self {
-      return {.x = me.x + b.x, .y = me.y + b.y};
+    fn Add[self: Self](b: Self) -> Self {
+      return {.x = self.x + b.x, .y = self.y + b.y};
     }
-    fn Scale[me: Self](v: f64) -> Self {
-      return {.x = me.x * v, .y = me.y * v};
+    fn Scale[self: Self](v: f64) -> Self {
+      return {.x = self.x * v, .y = self.y * v};
     }
   }
   alias Add = Vector.Add;
@@ -472,15 +472,15 @@ class Point4b {
 class Point4c {
   var x: f64;
   var y: f64;
-  fn Add[me: Self](b: Self) -> Self {
-    return {.x = me.x + b.x, .y = me.y + b.y};
+  fn Add[self: Self](b: Self) -> Self {
+    return {.x = self.x + b.x, .y = self.y + b.y};
   }
 }
 
 external impl Point4c as Vector {
   alias Add = Point4c.Add;  // Syntax TBD
-  fn Scale[me: Self](v: f64) -> Self {
-    return {.x = me.x * v, .y = me.y * v};
+  fn Scale[self: Self](v: f64) -> Self {
+    return {.x = self.x * v, .y = self.y * v};
   }
 }
 ```
@@ -545,7 +545,7 @@ package Plot;
 import Points;
 
 interface Drawable {
-  fn Draw[me: Self]();
+  fn Draw[self: Self]();
 }
 
 external impl Points.Point3 as Drawable { ... }
@@ -696,7 +696,7 @@ implementing `Vector`, and a function that takes a `GeneralPoint` and calls
 ```
 class GeneralPoint(C:! Numeric) {
   external impl as Vector { ... }
-  fn Get[me: Self](i: i32) -> C;
+  fn Get[self: Self](i: i32) -> C;
 }
 
 fn CallWithGeneralPoint[C:! Numeric](p: GeneralPoint(C)) -> C {
@@ -959,8 +959,8 @@ requirements of `I2`. This means a value `x` of type `T` may be passed to
 functions requiring types to satisfy `I2`, as in this example:
 
 ```
-interface Printable { fn Print[me: Self](); }
-interface Renderable { fn Draw[me: Self](); }
+interface Printable { fn Print[self: Self](); }
+interface Renderable { fn Draw[self: Self](); }
 
 constraint PrintAndRender {
   impl as Printable;
@@ -992,11 +992,11 @@ the union of the names minus any conflicts.
 
 ```
 interface Printable {
-  fn Print[me: Self]();
+  fn Print[self: Self]();
 }
 interface Renderable {
-  fn Center[me: Self]() -> (i32, i32);
-  fn Draw[me: Self]();
+  fn Center[self: Self]() -> (i32, i32);
+  fn Draw[self: Self]();
 }
 
 // `Printable & Renderable` is syntactic sugar for this type-of-type:
@@ -1017,11 +1017,11 @@ fn PrintThenDraw[T:! Printable & Renderable](x: T) {
 class Sprite {
   // ...
   impl as Printable {
-    fn Print[me: Self]() { ... }
+    fn Print[self: Self]() { ... }
   }
   impl as Renderable {
-    fn Center[me: Self]() -> (i32, i32) { ... }
-    fn Draw[me: Self]() { ... }
+    fn Center[self: Self]() -> (i32, i32) { ... }
+    fn Draw[self: Self]() { ... }
   }
 }
 
@@ -1034,12 +1034,12 @@ error to use.
 
 ```
 interface Renderable {
-  fn Center[me: Self]() -> (i32, i32);
-  fn Draw[me: Self]();
+  fn Center[self: Self]() -> (i32, i32);
+  fn Draw[self: Self]();
 }
 interface EndOfGame {
-  fn Draw[me: Self]();
-  fn Winner[me: Self](player: i32);
+  fn Draw[self: Self]();
+  fn Winner[self: Self](player: i32);
 }
 // `Renderable & EndOfGame` is syntactic sugar for this type-of-type:
 constraint {
@@ -1146,10 +1146,10 @@ requires all containers to also satisfy the requirements of
 semantics and syntax as we do for [named constraints](#named-constraints):
 
 ```
-interface Equatable { fn Equals[me: Self](rhs: Self) -> bool; }
+interface Equatable { fn Equals[self: Self](rhs: Self) -> bool; }
 
 interface Iterable {
-  fn Advance[addr me: Self*]() -> bool;
+  fn Advance[addr self: Self*]() -> bool;
   impl as Equatable;
 }
 
@@ -1162,8 +1162,8 @@ def DoAdvanceAndEquals[T:! Iterable](x: T) {
 }
 
 class Iota {
-  impl as Iterable { fn Advance[me: Self]() { ... } }
-  impl as Equatable { fn Equals[me: Self](rhs: Self) -> bool { ... } }
+  impl as Iterable { fn Advance[self: Self]() { ... } }
+  impl as Equatable { fn Equals[self: Self](rhs: Self) -> bool { ... } }
 }
 var x: Iota;
 DoAdvanceAndEquals(x);
@@ -1175,7 +1175,7 @@ declarations:
 
 ```
 interface Hashable {
-  fn Hash[me: Self]() -> u64;
+  fn Hash[self: Self]() -> u64;
   impl as Equatable;
   alias Equals = Equatable.Equals;
 }
@@ -1202,8 +1202,8 @@ as well. In the case of `Hashable` above, this includes all the members of
 ```
 class Song {
   impl as Hashable {
-    fn Hash[me: Self]() -> u64 { ... }
-    fn Equals[me: Self](rhs: Self) -> bool { ... }
+    fn Hash[self: Self]() -> u64 { ... }
+    fn Equals[self: Self](rhs: Self) -> bool { ... }
   }
 }
 var y: Song;
@@ -1222,17 +1222,17 @@ benefits:
 We expect this concept to be common enough to warrant dedicated syntax:
 
 ```
-interface Equatable { fn Equals[me: Self](rhs: Self) -> bool; }
+interface Equatable { fn Equals[self: Self](rhs: Self) -> bool; }
 
 interface Hashable {
   extends Equatable;
-  fn Hash[me: Self]() -> u64;
+  fn Hash[self: Self]() -> u64;
 }
 // is equivalent to the definition of Hashable from before:
 // interface Hashable {
 //   impl as Equatable;
 //   alias Equals = Equatable.Equals;
-//   fn Hash[me: Self]() -> u64;
+//   fn Hash[self: Self]() -> u64;
 // }
 ```
 
@@ -1295,10 +1295,10 @@ The `extends` declaration makes sense with the same meaning inside a
 
 ```
 interface Media {
-  fn Play[me: Self]();
+  fn Play[self: Self]();
 }
 interface Job {
-  fn Run[me: Self]();
+  fn Run[self: Self]();
 }
 
 constraint Combined {
@@ -1327,8 +1327,8 @@ constraint:
 ```
 class Song {
   impl as Combined {
-    fn Play[me: Self]() { ... }
-    fn Run[me: Self]() { ... }
+    fn Play[self: Self]() { ... }
+    fn Run[self: Self]() { ... }
   }
 }
 ```
@@ -1338,10 +1338,10 @@ This is equivalent to implementing the required interfaces directly:
 ```
 class Song {
   impl as Media {
-    fn Play[me: Self]() { ... }
+    fn Play[self: Self]() { ... }
   }
   impl as Job {
-    fn Run[me: Self]() { ... }
+    fn Run[self: Self]() { ... }
   }
 }
 ```
@@ -1356,7 +1356,7 @@ Conversely, an `interface` can extend a `constraint`:
 interface MovieCodec {
   extends Combined;
 
-  fn Load[addr me: Self*](filename: String);
+  fn Load[addr self: Self*](filename: String);
 }
 ```
 
@@ -1370,7 +1370,7 @@ interface MovieCodec {
   impl as Job;
   alias Run = Job.Run;
 
-  fn Load[addr me: Self*](filename: String);
+  fn Load[addr self: Self*](filename: String);
 }
 ```
 
@@ -1381,19 +1381,19 @@ Consider this set of interfaces, simplified from
 
 ```
 interface Graph {
-  fn Source[addr me: Self*](e: EdgeDescriptor) -> VertexDescriptor;
-  fn Target[addr me: Self*](e: EdgeDescriptor) -> VertexDescriptor;
+  fn Source[addr self: Self*](e: EdgeDescriptor) -> VertexDescriptor;
+  fn Target[addr self: Self*](e: EdgeDescriptor) -> VertexDescriptor;
 }
 
 interface IncidenceGraph {
   extends Graph;
-  fn OutEdges[addr me: Self*](u: VertexDescriptor)
+  fn OutEdges[addr self: Self*](u: VertexDescriptor)
     -> (EdgeIterator, EdgeIterator);
 }
 
 interface EdgeListGraph {
   extends Graph;
-  fn Edges[addr me: Self*]() -> (EdgeIterator, EdgeIterator);
+  fn Edges[addr self: Self*]() -> (EdgeIterator, EdgeIterator);
 }
 ```
 
@@ -1418,13 +1418,13 @@ though could be defined in the `impl` block of `IncidenceGraph`,
     ```
     class MyEdgeListIncidenceGraph {
       impl as IncidenceGraph {
-        fn Source[me: Self](e: EdgeDescriptor) -> VertexDescriptor { ... }
-        fn Target[me: Self](e: EdgeDescriptor) -> VertexDescriptor { ... }
-        fn OutEdges[addr me: Self*](u: VertexDescriptor)
+        fn Source[self: Self](e: EdgeDescriptor) -> VertexDescriptor { ... }
+        fn Target[self: Self](e: EdgeDescriptor) -> VertexDescriptor { ... }
+        fn OutEdges[addr self: Self*](u: VertexDescriptor)
             -> (EdgeIterator, EdgeIterator) { ... }
       }
       impl as EdgeListGraph {
-        fn Edges[addr me: Self*]() -> (EdgeIterator, EdgeIterator) { ... }
+        fn Edges[addr self: Self*]() -> (EdgeIterator, EdgeIterator) { ... }
       }
     }
     ```
@@ -1435,13 +1435,13 @@ though could be defined in the `impl` block of `IncidenceGraph`,
     ```
     class MyEdgeListIncidenceGraph {
       impl as IncidenceGraph {
-        fn Source[me: Self](e: EdgeDescriptor) -> VertexDescriptor { ... }
-        fn OutEdges[addr me: Self*](u: VertexDescriptor)
+        fn Source[self: Self](e: EdgeDescriptor) -> VertexDescriptor { ... }
+        fn OutEdges[addr self: Self*](u: VertexDescriptor)
             -> (EdgeIterator, EdgeIterator) { ... }
       }
       impl as EdgeListGraph {
-        fn Target[me: Self](e: EdgeDescriptor) -> VertexDescriptor { ... }
-        fn Edges[addr me: Self*]() -> (EdgeIterator, EdgeIterator) { ... }
+        fn Target[self: Self](e: EdgeDescriptor) -> VertexDescriptor { ... }
+        fn Edges[addr self: Self*]() -> (EdgeIterator, EdgeIterator) { ... }
       }
     }
     ```
@@ -1451,8 +1451,8 @@ though could be defined in the `impl` block of `IncidenceGraph`,
     ```
     class MyEdgeListIncidenceGraph {
       impl as Graph {
-        fn Source[me: Self](e: EdgeDescriptor) -> VertexDescriptor { ... }
-        fn Target[me: Self](e: EdgeDescriptor) -> VertexDescriptor { ... }
+        fn Source[self: Self](e: EdgeDescriptor) -> VertexDescriptor { ... }
+        fn Target[self: Self](e: EdgeDescriptor) -> VertexDescriptor { ... }
       }
       impl as IncidenceGraph { ... }
       impl as EdgeListGraph { ... }
@@ -1467,8 +1467,8 @@ though could be defined in the `impl` block of `IncidenceGraph`,
       impl as EdgeListGraph { ... }
     }
     external impl MyEdgeListIncidenceGraph as Graph {
-      fn Source[me: Self](e: EdgeDescriptor) -> VertexDescriptor { ... }
-      fn Target[me: Self](e: EdgeDescriptor) -> VertexDescriptor { ... }
+      fn Source[self: Self](e: EdgeDescriptor) -> VertexDescriptor { ... }
+      fn Target[self: Self](e: EdgeDescriptor) -> VertexDescriptor { ... }
     }
     ```
 
@@ -1490,17 +1490,17 @@ the capabilities of the iterator being passed in:
 
 ```
 interface ForwardIntIterator {
-  fn Advance[addr me: Self*]();
-  fn Get[me: Self]() -> i32;
+  fn Advance[addr self: Self*]();
+  fn Get[self: Self]() -> i32;
 }
 interface BidirectionalIntIterator {
   extends ForwardIntIterator;
-  fn Back[addr me: Self*]();
+  fn Back[addr self: Self*]();
 }
 interface RandomAccessIntIterator {
   extends BidirectionalIntIterator;
-  fn Skip[addr me: Self*](offset: i32);
-  fn Difference[me: Self](rhs: Self) -> i32;
+  fn Skip[addr self: Self*](offset: i32);
+  fn Difference[self: Self](rhs: Self) -> i32;
 }
 
 fn SearchInSortedList[IterT:! ForwardIntIterator]
@@ -1531,21 +1531,21 @@ APIs, in particular with different interface implementations, by
 
 ```
 interface Printable {
-  fn Print[me: Self]();
+  fn Print[self: Self]();
 }
 interface Comparable {
-  fn Less[me: Self](rhs: Self) -> bool;
+  fn Less[self: Self](rhs: Self) -> bool;
 }
 class Song {
-  impl as Printable { fn Print[me: Self]() { ... } }
+  impl as Printable { fn Print[self: Self]() { ... } }
 }
 adapter SongByTitle for Song {
   impl as Comparable {
-    fn Less[me: Self](rhs: Self) -> bool { ... }
+    fn Less[self: Self](rhs: Self) -> bool { ... }
   }
 }
 adapter FormattedSong for Song {
-  impl as Printable { fn Print[me: Self]() { ... } }
+  impl as Printable { fn Print[self: Self]() { ... } }
 }
 adapter FormattedSongByTitle for Song {
   impl as Printable = FormattedSong;
@@ -1575,8 +1575,8 @@ type may be accessed either by a cast:
 ```
 adapter SongByTitle for Song {
   impl as Comparable {
-    fn Less[me: Self](rhs: Self) -> bool {
-      return (me as Song).Title() < (rhs as Song).Title();
+    fn Less[self: Self](rhs: Self) -> bool {
+      return (self as Song).Title() < (rhs as Song).Title();
     }
   }
 }
@@ -1587,8 +1587,8 @@ or using a qualified member access expression:
 ```
 adapter SongByTitle for Song {
   impl as Comparable {
-    fn Less[me: Self](rhs: Self) -> bool {
-      return me.(Song.Title)() < rhs.(Song.Title)();
+    fn Less[self: Self](rhs: Self) -> bool {
+      return self.(Song.Title)() < rhs.(Song.Title)();
     }
   }
 }
@@ -1614,7 +1614,7 @@ Consider a type with a generic type parameter, like a hash map:
 ```
 interface Hashable { ... }
 class HashMap(KeyT:! Hashable, ValueT:! Type) {
-  fn Find[me:Self](key: KeyT) -> Optional(ValueT);
+  fn Find[self: Self](key: KeyT) -> Optional(ValueT);
   // ...
 }
 ```
@@ -1700,7 +1700,7 @@ individually or renamed using `alias` declarations.
 ```
 adapter SongRenderToPrintDriver extends Song {
   // Add a new `Print()` member function.
-  fn Print[me: Self]() { ... }
+  fn Print[self: Self]() { ... }
 
   // Avoid name conflict with new `Print` function by making
   // the implementation of the `Printable` interface external.
@@ -1766,7 +1766,7 @@ smaller:
 
 ```
 interface Comparable {
-  fn Less[me: Self](rhs: Self) -> bool;
+  fn Less[self: Self](rhs: Self) -> bool;
 }
 ```
 
@@ -1775,19 +1775,19 @@ another interface `Difference`:
 
 ```
 interface Difference {
-  fn Sub[me:Self](rhs: Self) -> i32;
+  fn Sub[self: Self](rhs: Self) -> i32;
 }
 adapter ComparableFromDifference(T:! Difference) for T {
   impl as Comparable {
-    fn Less[me: Self](rhs: Self) -> bool {
-      return (me as T).Sub(rhs) < 0;
+    fn Less[self: Self](rhs: Self) -> bool {
+      return (self as T).Sub(rhs) < 0;
     }
   }
 }
 class IntWrapper {
   var x: i32;
   impl as Difference {
-    fn Sub[me: Self](rhs: Self) -> i32 {
+    fn Sub[self: Self](rhs: Self) -> i32 {
       return left.x - right.x;
     }
   }
@@ -1802,8 +1802,8 @@ use to the adapter instead:
 adapter ComparableFromDifferenceFn
     (T:! Type, Difference:! fnty(T, T)->i32) for T {
   impl as Comparable {
-    fn Less[me: Self](rhs: Self) -> bool {
-      return Difference(me, rhs) < 0;
+    fn Less[self: Self](rhs: Self) -> bool {
+      return Difference(self, rhs) < 0;
     }
   }
 }
@@ -1824,14 +1824,14 @@ to say that type implements an interface as a private detail internal to the
 implementation of the type. In that case, instead of implementing the interface
 for the public type, the library can create a private adapter for that type and
 implement the interface on that instead. Any member of the class can cast its
-`me` parameter to the adapter type when it wants to make use of the private
+`self` parameter to the adapter type when it wants to make use of the private
 impl.
 
 ```
 // Public, in API file
 class Complex64 {
   // ...
-  fn CloserToOrigin[me: Self](them: Self) -> bool;
+  fn CloserToOrigin[self: Self](them: Self) -> bool;
 }
 
 // Private
@@ -1841,14 +1841,14 @@ adapter ByReal extends Complex64 {
   // but this comparison function is useful for some
   // method implementations.
   impl as Comparable {
-    fn Less[me: Self](that: Self) -> bool {
-      return me.Real() < that.Real();
+    fn Less[self: Self](that: Self) -> bool {
+      return self.Real() < that.Real();
     }
   }
 }
 
-fn Complex64.CloserToOrigin[me: Self](them: Self) -> bool {
-  var me_mag: ByReal = me * me.Conj() as ByReal;
+fn Complex64.CloserToOrigin[self: Self](them: Self) -> bool {
+  var me_mag: ByReal = self * self.Conj() as ByReal;
   var them_mag: ByReal = them * them.Conj() as ByReal;
   return me_mag.Less(them_mag);
 }
@@ -1861,10 +1861,10 @@ that is [implemented externally](terminology.md#external-impl) for a type.
 
 ```
 interface DrawingContext {
-  fn SetPen[me: Self](...);
-  fn SetFill[me: Self](...);
-  fn DrawRectangle[me: Self](...);
-  fn DrawLine[me: Self](...);
+  fn SetPen[self: Self](...);
+  fn SetFill[self: Self](...);
+  fn DrawRectangle[self: Self](...);
+  fn DrawLine[self: Self](...);
   ...
 }
 external impl Window as DrawingContext { ... }
@@ -1914,10 +1914,10 @@ associated constant.
 interface NSpacePoint {
   let N:! i32;
   // The following require: 0 <= i < N.
-  fn Get[addr me: Self*](i: i32) -> f64;
-  fn Set[addr me: Self*](i: i32, value: f64);
+  fn Get[addr self: Self*](i: i32) -> f64;
+  fn Set[addr self: Self*](i: i32, value: f64);
   // Associated constants may be used in signatures:
-  fn SetAll[addr me: Self*](value: Array(f64, N));
+  fn SetAll[addr self: Self*](value: Array(f64, N));
 }
 ```
 
@@ -1928,17 +1928,17 @@ a [`where` clause](#where-constraints). For example, implementations of
 ```
 class Point2D {
   impl as NSpacePoint where .N = 2 {
-    fn Get[addr me: Self*](i: i32) -> f64 { ... }
-    fn Set[addr me: Self*](i: i32, value: f64) { ... }
-    fn SetAll[addr me: Self*](value: Array(f64, 2)) { ... }
+    fn Get[addr self: Self*](i: i32) -> f64 { ... }
+    fn Set[addr self: Self*](i: i32, value: f64) { ... }
+    fn SetAll[addr self: Self*](value: Array(f64, 2)) { ... }
   }
 }
 
 class Point3D {
   impl as NSpacePoint where .N = 3 {
-    fn Get[addr me: Self*](i: i32) -> f64 { ... }
-    fn Set[addr me: Self*](i: i32, value: f64) { ... }
-    fn SetAll[addr me: Self*](value: Array(f64, 3)) { ... }
+    fn Get[addr self: Self*](i: i32) -> f64 { ... }
+    fn Set[addr self: Self*](i: i32, value: f64) { ... }
+    fn SetAll[addr self: Self*](value: Array(f64, 3)) { ... }
   }
 }
 ```
@@ -2030,9 +2030,9 @@ name. For example:
 ```
 interface StackAssociatedType {
   let ElementType:! Type;
-  fn Push[addr me: Self*](value: ElementType);
-  fn Pop[addr me: Self*]() -> ElementType;
-  fn IsEmpty[addr me: Self*]() -> bool;
+  fn Push[addr self: Self*](value: ElementType);
+  fn Pop[addr self: Self*]() -> ElementType;
+  fn IsEmpty[addr self: Self*]() -> bool;
 }
 ```
 
@@ -2045,26 +2045,26 @@ implements `StackAssociatedType`:
 ```
 class DynamicArray(T:! Type) {
   class IteratorType { ... }
-  fn Begin[addr me: Self*]() -> IteratorType;
-  fn End[addr me: Self*]() -> IteratorType;
-  fn Insert[addr me: Self*](pos: IteratorType, value: T);
-  fn Remove[addr me: Self*](pos: IteratorType);
+  fn Begin[addr self: Self*]() -> IteratorType;
+  fn End[addr self: Self*]() -> IteratorType;
+  fn Insert[addr self: Self*](pos: IteratorType, value: T);
+  fn Remove[addr self: Self*](pos: IteratorType);
 
   // Set the associated type `ElementType` to `T`.
   impl as StackAssociatedType where .ElementType = T {
-    fn Push[addr me: Self*](value: ElementType) {
-      me->Insert(me->End(), value);
+    fn Push[addr self: Self*](value: ElementType) {
+      self->Insert(self->End(), value);
     }
-    fn Pop[addr me: Self*]() -> ElementType {
-      var pos: IteratorType = me->End();
-      Assert(pos != me->Begin());
+    fn Pop[addr self: Self*]() -> ElementType {
+      var pos: IteratorType = self->End();
+      Assert(pos != self->Begin());
       --pos;
       returned var ret: ElementType = *pos;
-      me->Remove(pos);
+      self->Remove(pos);
       return var;
     }
-    fn IsEmpty[addr me: Self*]() -> bool {
-      return me->Begin() == me->End();
+    fn IsEmpty[addr self: Self*]() -> bool {
+      return self->Begin() == self->End();
     }
   }
 }
@@ -2155,12 +2155,12 @@ witness table.
 
 ```
 interface Iterator {
-  fn Advance[addr me: Self*]();
+  fn Advance[addr self: Self*]();
 }
 
 interface Container {
   let IteratorType:! Iterator;
-  fn Begin[addr me: Self*]() -> IteratorType;
+  fn Begin[addr self: Self*]() -> IteratorType;
 }
 ```
 
@@ -2198,9 +2198,9 @@ of the associated type declaration:
 
 ```
 interface StackParameterized(ElementType:! Type) {
-  fn Push[addr me: Self*](value: ElementType);
-  fn Pop[addr me: Self*]() -> ElementType;
-  fn IsEmpty[addr me: Self*]() -> bool;
+  fn Push[addr self: Self*](value: ElementType);
+  fn Pop[addr self: Self*]() -> ElementType;
+  fn IsEmpty[addr self: Self*]() -> bool;
 }
 ```
 
@@ -2212,25 +2212,25 @@ class Produce {
   var fruit: DynamicArray(Fruit);
   var veggie: DynamicArray(Veggie);
   impl as StackParameterized(Fruit) {
-    fn Push[addr me: Self*](value: Fruit) {
-      me->fruit.Push(value);
+    fn Push[addr self: Self*](value: Fruit) {
+      self->fruit.Push(value);
     }
-    fn Pop[addr me: Self*]() -> Fruit {
-      return me->fruit.Pop();
+    fn Pop[addr self: Self*]() -> Fruit {
+      return self->fruit.Pop();
     }
-    fn IsEmpty[addr me: Self*]() -> bool {
-      return me->fruit.IsEmpty();
+    fn IsEmpty[addr self: Self*]() -> bool {
+      return self->fruit.IsEmpty();
     }
   }
   impl as StackParameterized(Veggie) {
-    fn Push[addr me: Self*](value: Veggie) {
-      me->veggie.Push(value);
+    fn Push[addr self: Self*](value: Veggie) {
+      self->veggie.Push(value);
     }
-    fn Pop[addr me: Self*]() -> Veggie {
-      return me->veggie.Pop();
+    fn Pop[addr self: Self*]() -> Veggie {
+      return self->veggie.Pop();
     }
-    fn IsEmpty[addr me: Self*]() -> bool {
-      return me->veggie.IsEmpty();
+    fn IsEmpty[addr self: Self*]() -> bool {
+      return self->veggie.IsEmpty();
     }
   }
 }
@@ -2278,7 +2278,7 @@ be comparable with multiple other types, and in fact interfaces for
 
 ```
 interface EquatableWith(T:! Type) {
-  fn Equals[me: Self](rhs: T) -> bool;
+  fn Equals[self: Self](rhs: T) -> bool;
   ...
 }
 class Complex {
@@ -2307,8 +2307,8 @@ could be an interface parameter:
 ```
 interface ReadTupleMember(index:! u32) {
   let T:! Type;
-  // Returns me[index]
-  fn Get[me: Self]() -> T;
+  // Returns self[index]
+  fn Get[self: Self]() -> T;
 }
 ```
 
@@ -2320,7 +2320,7 @@ parameters are required to always be different. For example:
 
 ```
 interface Map(FromType:! Type, ToType:! Type) {
-  fn Map[addr me: Self*](needle: FromType) -> Optional(ToType);
+  fn Map[addr self: Self*](needle: FromType) -> Optional(ToType);
 }
 class Bijection(FromType:! Type, ToType:! Type) {
   impl as Map(FromType, ToType) { ... }
@@ -2412,7 +2412,7 @@ fn F[V:! D where ...](v: V) { ... }
 // Constraints on a class parameter:
 class S(T:! B where ...) {
   // Constraints on a method:
-  fn G[me: Self, V:! D where ...](v: V);
+  fn G[self: Self, V:! D where ...](v: V);
 }
 
 // Constraints on an interface parameter:
@@ -2420,7 +2420,7 @@ interface A(T:! B where ...) {
   // Constraints on an associated type:
   let U:! C where ...;
   // Constraints on an associated method:
-  fn G[me: Self, V:! D where ...](v: V);
+  fn G[self: Self, V:! D where ...](v: V);
 }
 ```
 
@@ -2754,7 +2754,7 @@ to encode the return type:
 interface HasAbs {
   extends Numeric;
   let MagnitudeType:! Numeric;
-  fn Abs[me: Self]() -> MagnitudeType;
+  fn Abs[self: Self]() -> MagnitudeType;
 }
 ```
 
@@ -2797,7 +2797,7 @@ interface Container {
       where .ElementType == ElementType and
             .SliceType == .Self;
 
-  fn GetSlice[addr me: Self*]
+  fn GetSlice[addr self: Self*]
       (start: IteratorType, end: IteratorType) -> SliceType;
 }
 ```
@@ -2877,7 +2877,7 @@ from an integer type like `i32`:
 
 ```
 interface As(T:! Type) {
-  fn Convert[me: Self]() -> T;
+  fn Convert[self: Self]() -> T;
 }
 
 fn Double[T:! Mul where i32 is As(.Self)](x: T) -> T {
@@ -2993,7 +2993,7 @@ limited to a single signature. Consider this interface declaration:
 ```
 interface GraphNode {
   let Edge:! Type;
-  fn EdgesFrom[me: Self]() -> HashSet(Edge);
+  fn EdgesFrom[self: Self]() -> HashSet(Edge);
 }
 ```
 
@@ -3082,17 +3082,17 @@ Given this interface `Transitive` that has associated types that are constrained
 to all be equal, with interfaces `P`, `Q`, and `R`:
 
 ```
-interface P { fn InP[me:Self](); }
-interface Q { fn InQ[me:Self](); }
-interface R { fn InR[me:Self](); }
+interface P { fn InP[self: Self](); }
+interface Q { fn InQ[self: Self](); }
+interface R { fn InR[self: Self](); }
 
 interface Transitive {
   let A:! P;
   let B:! Q where .Self == A;
   let C:! R where .Self == B;
 
-  fn GetA[me: Self]() -> A;
-  fn TakesC[me:Self](c: C);
+  fn GetA[self: Self]() -> A;
+  fn TakesC[self: Self](c: C);
 }
 ```
 
@@ -3157,9 +3157,9 @@ interface Commute {
   let X:! Commute;
   let Y:! Commute where .X == X.Y;
 
-  fn GetX[me: Self]() -> X;
-  fn GetY[me: Self]() -> Y;
-  fn TakesXXY[me:Self](xxy: X.X.Y);
+  fn GetX[self: Self]() -> X;
+  fn GetY[self: Self]() -> Y;
+  fn TakesXXY[self: Self](xxy: X.X.Y);
 }
 ```
 
@@ -3254,17 +3254,17 @@ link between associated types `A` and `C` that allows function `F` to type
 check.
 
 ```
-interface P { fn InP[me:Self](); }
-interface Q { fn InQ[me:Self](); }
-interface R { fn InR[me:Self](); }
+interface P { fn InP[self: Self](); }
+interface Q { fn InQ[self: Self](); }
+interface R { fn InR[self: Self](); }
 
 interface Transitive {
   let A:! P;
   let B:! Q where .Self == A;
   let C:! R where .Self == B;
 
-  fn GetA[me: Self]() -> A;
-  fn TakesC[me:Self](c: C);
+  fn GetA[self: Self]() -> A;
+  fn TakesC[self: Self](c: C);
 
   // Without this `observe` declaration, the
   // calls in `F` below would not be allowed.
@@ -3382,7 +3382,7 @@ the same interface for a type.
 ```
 enum CompareResult { Less, Equal, Greater }
 interface Comparable {
-  fn Compare[me: Self](rhs: Self) -> CompareResult;
+  fn Compare[self: Self](rhs: Self) -> CompareResult;
 }
 fn CombinedLess[T:! Type](a: T, b: T,
                           U:! CompatibleWith(T) & Comparable,
@@ -3442,9 +3442,9 @@ adapter ThenCompare(
       CompareList:! List(CompatibleWith(T) & Comparable))
     for T {
   impl as Comparable {
-    fn Compare[me: Self](rhs: Self) -> CompareResult {
+    fn Compare[self: Self](rhs: Self) -> CompareResult {
       for (let U:! auto in CompareList) {
-        var result: CompareResult = (me as U).Compare(rhs as U);
+        var result: CompareResult = (self as U).Compare(rhs as U);
         if (result != CompareResult.Equal) {
           return result;
         }
@@ -3738,15 +3738,15 @@ To do this with an [out-of-line `impl`](#external-impl), specify a more-specific
 
 ```
 interface Printable {
-  fn Print[me: Self]();
+  fn Print[self: Self]();
 }
 class Vector(T:! Type) { ... }
 
 // By saying "T:! Printable" instead of "T:! Type" here,
 // we constrain T to be Printable for this impl.
 external impl forall [T:! Printable] Vector(T) as Printable {
-  fn Print[me: Self]() {
-    for (let a: T in me) {
+  fn Print[self: Self]() {
+    for (let a: T in self) {
       // Can call `Print` on `a` since the constraint
       // on `T` ensures it implements `Printable`.
       a.Print();
@@ -3805,11 +3805,11 @@ member name, even if their conditions are mutually exclusive:
 ```
 class X(T:! Type) {
   impl X(i32) as Foo {
-    fn F[me: Self]();
+    fn F[self: Self]();
   }
   impl X(i64) as Bar {
     // ❌ Illegal: name conflict between `Foo.F` and `Bar.F`
-    fn F[me: Self](n: i64);
+    fn F[self: Self](n: i64);
   }
 }
 ```
@@ -3820,11 +3820,11 @@ is no overlap in the conditions:
 ```
 class X(T:! Type) {
   impl X(i32) as Foo {
-    fn F[me: Self]();
+    fn F[self: Self]();
   }
   impl X(i64) as Foo {
     // ✅ Allowed: `X(T).F` consistently means `X(T).(Foo.F)`
-    fn F[me: Self]();
+    fn F[self: Self]();
   }
 }
 ```
@@ -3849,7 +3849,7 @@ a vector type that only has a `Sort` method if its elements implement the
 ```
 class Vector(T:! Type) {
   // `Vector(T)` has a `Sort()` method if `T` is `Comparable`.
-  fn Sort[C:! Comparable, addr me: Vector(C)*]();
+  fn Sort[C:! Comparable, addr self: Vector(C)*]();
 }
 ```
 
@@ -4228,20 +4228,20 @@ generic function call, such as using an operator:
 // Interface defining the behavior of the prefix-* operator
 interface Deref {
   let Result:! Type;
-  fn DoDeref[me: Self]() -> Result;
+  fn DoDeref[self: Self]() -> Result;
 }
 
 // Types implementing `Deref`
 class Ptr(T:! Type) {
   ...
   external impl as Deref where .Result = T {
-    fn DoDeref[me: Self]() -> Result { ... }
+    fn DoDeref[self: Self]() -> Result { ... }
   }
 }
 class Optional(T:! Type) {
   ...
   external impl as Deref where .Result = T {
-    fn DoDeref[me: Self]() -> Result { ... }
+    fn DoDeref[self: Self]() -> Result { ... }
   }
 }
 
@@ -4271,14 +4271,14 @@ class Ptr(T:! Type) {
   ...
   // Note: added `final`
   final external impl as Deref where .Result = T {
-    fn DoDeref[me: Self]() -> Result { ... }
+    fn DoDeref[self: Self]() -> Result { ... }
   }
 }
 class Optional(T:! Type) {
   ...
   // Note: added `final`
   final external impl as Deref where .Result = T {
-    fn DoDeref[me: Self]() -> Result { ... }
+    fn DoDeref[self: Self]() -> Result { ... }
   }
 }
 
@@ -4683,11 +4683,11 @@ private constraint NodeFor(E:! Edge);
 // Define interfaces using named constraints.
 interface Edge {
   let NodeType:! NodeFor(Self);
-  fn Head[me: Self]() -> NodeType;
+  fn Head[self: Self]() -> NodeType;
 }
 interface Node {
   let EdgeType:! EdgeFor(Self);
-  fn Edges[me: Self]() -> Vector(EdgeType);
+  fn Edges[self: Self]() -> Vector(EdgeType);
 }
 
 // Now that the interfaces are defined, can
@@ -4764,11 +4764,11 @@ methods in the interface.
 
 ```
 interface Vector {
-  fn Add[me: Self](b: Self) -> Self;
-  fn Scale[me: Self](v: f64) -> Self;
+  fn Add[self: Self](b: Self) -> Self;
+  fn Scale[self: Self](v: f64) -> Self;
   // Default definition of `Invert` calls `Scale`.
-  default fn Invert[me: Self]() -> Self {
-    return me.Scale(-1.0);
+  default fn Invert[self: Self]() -> Self {
+    return self.Scale(-1.0);
   }
 }
 ```
@@ -4778,14 +4778,14 @@ file as the interface definition:
 
 ```
 interface Vector {
-  fn Add[me: Self](b: Self) -> Self;
-  fn Scale[me: Self](v: f64) -> Self;
-  default fn Invert[me: Self]() -> Self;
+  fn Add[self: Self](b: Self) -> Self;
+  fn Scale[self: Self](v: f64) -> Self;
+  default fn Invert[self: Self]() -> Self;
 }
 // `Vector` is considered complete at this point,
 // even though `Vector.Invert` is still incomplete.
-fn Vector.Invert[me: Self]() -> Self {
-  return me.Scale(-1.0);
+fn Vector.Invert[self: Self]() -> Self {
+  return self.Scale(-1.0);
 }
 ```
 
@@ -4805,12 +4805,12 @@ types, and interface parameters, using the `= <default value>` syntax.
 ```
 interface Add(Right:! Type = Self) {
   default let Result:! Type = Self;
-  fn DoAdd[me: Self](right: Right) -> Result;
+  fn DoAdd[self: Self](right: Right) -> Result;
 }
 
 impl String as Add() {
   // Right == Result == Self == String
-  fn DoAdd[me: Self](right: Self) -> Self;
+  fn DoAdd[self: Self](right: Self) -> Self;
 }
 ```
 
@@ -4843,12 +4843,12 @@ interface.
 
 ```
 interface TotalOrder {
-  fn TotalLess[me: Self](right: Self) -> bool;
+  fn TotalLess[self: Self](right: Self) -> bool;
   // ❌ Illegal: May not provide definition
   //             for required interface.
   impl as PartialOrder {
-    fn PartialLess[me: Self](right: Self) -> bool {
-      return me.TotalLess(right);
+    fn PartialLess[self: Self](right: Self) -> bool {
+      return self.TotalLess(right);
     }
   }
 }
@@ -4859,13 +4859,13 @@ instead:
 
 ```
 interface TotalOrder {
-  fn TotalLess[me: Self](right: Self) -> bool;
+  fn TotalLess[self: Self](right: Self) -> bool;
   impl as PartialOrder;
 }
 
 external impl forall [T:! TotalOrder] T as PartialOrder {
-  fn PartialLess[me: Self](right: Self) -> bool {
-    return me.TotalLess(right);
+  fn PartialLess[self: Self](right: Self) -> bool {
+    return self.TotalLess(right);
   }
 }
 ```
@@ -4888,18 +4888,18 @@ overridden in impls.
 
 ```
 interface TotalOrder {
-  fn TotalLess[me: Self](right: Self) -> bool;
-  final fn TotalGreater[me: Self](right: Self) -> bool {
-    return right.TotalLess(me);
+  fn TotalLess[self: Self](right: Self) -> bool;
+  final fn TotalGreater[self: Self](right: Self) -> bool {
+    return right.TotalLess(self);
   }
 }
 
 class String {
   impl as TotalOrder {
-    fn TotalLess[me: Self](right: Self) -> bool { ... }
+    fn TotalLess[self: Self](right: Self) -> bool { ... }
     // ❌ Illegal: May not provide definition of final
     //             method `TotalGreater`.
-    fn TotalGreater[me: Self](right: Self) -> bool { ... }
+    fn TotalGreater[self: Self](right: Self) -> bool { ... }
   }
 }
 
@@ -4908,7 +4908,7 @@ interface Add(T:! Type = Self) {
   final let AddWith:! Type = T;
   // Has a *default* of `Self`
   let Result:! Type = Self;
-  fn DoAdd[me: Self](right: AddWith) -> Result;
+  fn DoAdd[self: Self](right: AddWith) -> Result;
 }
 ```
 
@@ -4916,13 +4916,13 @@ Final members may also be defined out-of-line:
 
 ```
 interface TotalOrder {
-  fn TotalLess[me: Self](right: Self) -> bool;
-  final fn TotalGreater[me: Self](right: Self) -> bool;
+  fn TotalLess[self: Self](right: Self) -> bool;
+  final fn TotalGreater[self: Self](right: Self) -> bool;
 }
 // `TotalOrder` is considered complete at this point, even
 // though `TotalOrder.TotalGreater` is not yet defined.
-fn TotalOrder.TotalGreater[me: Self](right: Self) -> bool {
- return right.TotalLess(me);
+fn TotalOrder.TotalGreater[self: Self](right: Self) -> bool {
+ return right.TotalLess(self);
 }
 ```
 
@@ -5199,7 +5199,7 @@ interface to overload the unary `-` operator:
 // Unary `-`.
 interface Negatable {
   let Result:! Type = Self;
-  fn Negate[me: Self]() -> Result;
+  fn Negate[self: Self]() -> Result;
 }
 ```
 
@@ -5221,7 +5221,7 @@ expression, implement the
 
 ```
 interface As(Dest:! Type) {
-  fn Convert[me: Self]() -> Dest;
+  fn Convert[self: Self]() -> Dest;
 }
 ```
 
@@ -5237,7 +5237,7 @@ for a binary operator like `*`:
 // Binary `*`.
 interface MultipliableWith(U:! Type) {
   let Result:! Type = Self;
-  fn Multiply[me: Self](other: U) -> Result;
+  fn Multiply[self: Self](other: U) -> Result;
 }
 ```
 
@@ -5260,14 +5260,14 @@ second implementation from the first, as in:
 
 ```
 interface ComparableWith(RHS:! Type) {
-  fn Compare[me: Self](right: RHS) -> CompareResult;
+  fn Compare[self: Self](right: RHS) -> CompareResult;
 }
 
 adapter ReverseComparison
     (T:! Type, U:! ComparableWith(RHS)) for T {
   impl as ComparableWith(U) {
-    fn Compare[me: Self](right: RHS) -> CompareResult {
-      return ReverseCompareResult(right.Compare(me));
+    fn Compare[self: Self](right: RHS) -> CompareResult {
+      return ReverseCompareResult(right.Compare(self));
     }
   }
 }
@@ -5287,7 +5287,7 @@ an interface that the other implements:
 
 ```
 interface IntLike {
-  fn AsInt[me: Self]() -> i64;
+  fn AsInt[self: Self]() -> i64;
 }
 
 class EvenInt { ... }
@@ -5328,13 +5328,13 @@ multiplying by a value of type `f64`:
 
 ```
 class Meters {
-  fn Scale[me: Self](s: f64) -> Self;
+  fn Scale[self: Self](s: f64) -> Self;
 }
 // "Implementation One"
 external impl Meters as MultipliableWith(f64)
     where .Result = Meters {
-  fn Multiply[me: Self](other: f64) -> Result {
-    return me.Scale(other);
+  fn Multiply[self: Self](other: f64) -> Result {
+    return self.Scale(other);
   }
 }
 ```
@@ -5362,10 +5362,10 @@ conversion. The implementation is for types that implement the
 // "Implementation Two"
 external impl forall [T:! ImplicitAs(f64)]
     Meters as MultipliableWith(T) where .Result = Meters {
-  fn Multiply[me: Self](other: T) -> Result {
+  fn Multiply[self: Self](other: T) -> Result {
     // Carbon will implicitly convert `other` from type
     // `T` to `f64` to perform this call.
-    return me.(Meters.(MultipliableWith(f64).Multiply))(other);
+    return self.(Meters.(MultipliableWith(f64).Multiply))(other);
   }
 }
 // ✅ Allowed: uses `Meters as MultipliableWith(T)` impl
@@ -5386,8 +5386,8 @@ of a forward declaration or definition, in a place of a type.
 // compared to "implementation one" above.
 external impl Meters as MultipliableWith(like f64)
     where .Result = Meters {
-  fn Multiply[me: Self](other: f64) -> Result {
-    return me.Scale(other);
+  fn Multiply[self: Self](other: f64) -> Result {
+    return self.Scale(other);
   }
 }
 ```
@@ -5409,8 +5409,8 @@ In this example, there are two uses of `like`, producing three implementations
 ```
 external impl like Meters as MultipliableWith(like f64)
     where .Result = Meters {
-  fn Multiply[me: Self](other: f64) -> Result {
-    return me.Scale(other);
+  fn Multiply[self: Self](other: f64) -> Result {
+    return self.Scale(other);
   }
 }
 ```
@@ -5420,10 +5420,10 @@ is equivalent to "implementation one", "implementation two", and:
 ```
 external impl forall [T:! ImplicitAs(Meters)]
     T as MultipliableWith(f64) where .Result = Meters {
-  fn Multiply[me: Self](other: f64) -> Result {
-    // Will implicitly convert `me` to `Meters` in order to
+  fn Multiply[self: Self](other: f64) -> Result {
+    // Will implicitly convert `self` to `Meters` in order to
     // match the signature of this `Multiply` method.
-    return me.(Meters.(MultipliableWith(f64).Multiply))(other);
+    return self.(Meters.(MultipliableWith(f64).Multiply))(other);
   }
 }
 ```
@@ -5490,7 +5490,7 @@ there is one from `Vector(T)` to `Vector(String)`, so the following use of
 ```
 // ❌ Illegal: Can't convert a value with type
 //             `Vector(T:! ImplicitAs(String))`
-//             to `Vector(String)` for `me`
+//             to `Vector(String)` for `self`
 //             parameter of `Printable.Print`.
 external impl Vector(like String) as Printable;
 ```
@@ -5546,7 +5546,7 @@ class HashMap(
   // `Self` is `HashMap(KeyType, ValueType)`.
 
   // Parameters may be used in function signatures.
-  fn Insert[addr me: Self*](k: KeyType, v: ValueType);
+  fn Insert[addr self: Self*](k: KeyType, v: ValueType);
 
   // Parameters may be used in field types.
   private var buckets: Vector((KeyType, ValueType));
diff --git a/docs/design/generics/overview.md b/docs/design/generics/overview.md
index 5e7330b9bbb8..e07bf082c54e 100644
--- a/docs/design/generics/overview.md
+++ b/docs/design/generics/overview.md
@@ -159,7 +159,7 @@ Example:
 ```
 interface Comparable {
   // `Less` is an associated method.
-  fn Less[me: Self](rhs: Self) -> bool;
+  fn Less[self: Self](rhs: Self) -> bool;
 }
 ```
 
@@ -192,7 +192,7 @@ Consider this interface:
 
 ```
 interface Printable {
-  fn Print[me: Self]();
+  fn Print[self: Self]();
 }
 ```
 
@@ -209,7 +209,7 @@ class Song {
   // as `F`, are included as a part of the `Song` API.
   impl as Printable {
     // Could use `Self` in place of `Song` here.
-    fn Print[me: Song]() { ... }
+    fn Print[self: Song]() { ... }
   }
 }
 
@@ -218,7 +218,7 @@ class Song {
 // the library defining `Song` or `Comparable`.
 external impl Song as Comparable {
   // Could use either `Self` or `Song` here.
-  fn Less[me: Self](rhs: Self) -> bool { ... }
+  fn Less[self: Self](rhs: Self) -> bool { ... }
 }
 ```
 
@@ -350,13 +350,13 @@ Interfaces can require other interfaces be implemented:
 
 ```
 interface Equatable {
-  fn IsEqual[me: Self](rhs: Self) -> bool;
+  fn IsEqual[self: Self](rhs: Self) -> bool;
 }
 
 // `Iterable` requires that `Equatable` is implemented.
 interface Iterable {
   impl as Equatable;
-  fn Advance[addr me: Self*]();
+  fn Advance[addr self: Self*]();
 }
 ```
 
@@ -369,13 +369,13 @@ interface.
 // `Hashable` extends `Equatable`.
 interface Hashable {
   extends Equatable;
-  fn Hash[me: Self]() -> u64;
+  fn Hash[self: Self]() -> u64;
 }
 // `Hashable` is equivalent to:
 interface Hashable {
   impl as Equatable;
   alias IsEqual = Equatable.IsEqual;
-  fn Hash[me: Self]() -> u64;
+  fn Hash[self: Self]() -> u64;
 }
 ```
 
@@ -386,8 +386,8 @@ methods in the implementation of the derived interface.
 class Key {
   // ...
   impl as Hashable {
-    fn IsEqual[me: Key](rhs: Key) -> bool { ... }
-    fn Hash[me: Key]() -> u64 { ... }
+    fn IsEqual[self: Key](rhs: Key) -> bool { ... }
+    fn Hash[self: Key]() -> u64 { ... }
   }
   // No need to separately implement `Equatable`.
 }
@@ -403,14 +403,14 @@ It gives you all the names that don't conflict.
 
 ```
 interface Renderable {
-  fn GetCenter[me: Self]() -> (i32, i32);
+  fn GetCenter[self: Self]() -> (i32, i32);
   // Draw the object to the screen
-  fn Draw[me: Self]();
+  fn Draw[self: Self]();
 }
 interface EndOfGame {
-  fn SetWinner[addr me: Self*](player: i32);
+  fn SetWinner[addr self: Self*](player: i32);
   // Indicate the game was a draw
-  fn Draw[addr me: Self*]();
+  fn Draw[addr self: Self*]();
 }
 
 fn F[T:! Renderable & EndOfGame](game_state: T*) -> (i32, i32) {
@@ -533,9 +533,9 @@ element types:
 ```
 interface Stack {
   let ElementType:! Movable;
-  fn Push[addr me: Self*](value: ElementType);
-  fn Pop[addr me: Self*]() -> ElementType;
-  fn IsEmpty[addr me: Self*]() -> bool;
+  fn Push[addr self: Self*](value: ElementType);
+  fn Pop[addr self: Self*]() -> ElementType;
+  fn IsEmpty[addr self: Self*]() -> bool;
 }
 ```
 
@@ -561,7 +561,7 @@ those types to be different. An element in a hash map might have type
 
 ```
 interface Equatable(T:! Type) {
-  fn IsEqual[me: Self](compare_to: T) -> bool;
+  fn IsEqual[self: Self](compare_to: T) -> bool;
 }
 ```
 
diff --git a/docs/design/generics/terminology.md b/docs/design/generics/terminology.md
index f471287365cb..5102397b346c 100644
--- a/docs/design/generics/terminology.md
+++ b/docs/design/generics/terminology.md
@@ -661,8 +661,8 @@ associated types. An associated type is a kind of
 // Stack using associated types
 interface Stack {
   let ElementType:! Type;
-  fn Push[addr me: Self*](value: ElementType);
-  fn Pop[addr me: Self*]() -> ElementType;
+  fn Push[addr self: Self*](value: ElementType);
+  fn Pop[addr self: Self*]() -> ElementType;
 }
 
 // Works on any type implementing `Stack`. Return type
@@ -698,7 +698,7 @@ another type:
 ```
 interface AddWith(T:! Type) {
   let ResultType:! Type;
-  fn Add[me: Self](rhs: T) -> ResultType;
+  fn Add[self: Self](rhs: T) -> ResultType;
 }
 ```
 
diff --git a/docs/design/templates.md b/docs/design/templates.md
index 7377e68ed494..013eef15c7a5 100644
--- a/docs/design/templates.md
+++ b/docs/design/templates.md
@@ -47,8 +47,8 @@ bound early to the extent possible. For example:
 class Stack(template T:! Type) {
   var storage: Array(T);
 
-  fn Push[addr me: Self*](value: T);
-  fn Pop[addr me: Self*]() -> T;
+  fn Push[addr self: Self*](value: T);
+  fn Pop[addr self: Self*]() -> T;
 }
 ```
 
diff --git a/explorer/ast/declaration.cpp b/explorer/ast/declaration.cpp
index 1b84ce9ad077..16e1204eed27 100644
--- a/explorer/ast/declaration.cpp
+++ b/explorer/ast/declaration.cpp
@@ -265,14 +265,14 @@ namespace {
 
 // The deduced parameters of a function declaration.
 struct DeducedParameters {
-  // The `me` parameter, if any.
-  std::optional<Nonnull<Pattern*>> me_pattern;
+  // The `self` parameter, if any.
+  std::optional<Nonnull<Pattern*>> self_pattern;
 
   // All other deduced parameters.
   std::vector<Nonnull<GenericBinding*>> resolved_params;
 };
 
-// Split the `me` pattern (if any) out of `deduced_params`.
+// Split the `self` pattern (if any) out of `deduced_params`.
 auto SplitDeducedParameters(
     SourceLocation source_loc,
     const std::vector<Nonnull<AstNode*>>& deduced_params)
@@ -285,32 +285,32 @@ auto SplitDeducedParameters(
         break;
       case AstNodeKind::BindingPattern: {
         Nonnull<BindingPattern*> binding = &cast<BindingPattern>(*param);
-        if (binding->name() != "me") {
+        if (binding->name() != "self") {
           return ProgramError(source_loc)
                  << "illegal binding pattern in implicit parameter list";
         }
-        if (result.me_pattern.has_value()) {
+        if (result.self_pattern.has_value()) {
           return ProgramError(source_loc)
-                 << "parameter list cannot contain more than one `me` "
+                 << "parameter list cannot contain more than one `self` "
                     "parameter";
         }
-        result.me_pattern = binding;
+        result.self_pattern = binding;
         break;
       }
       case AstNodeKind::AddrPattern: {
         Nonnull<AddrPattern*> addr_pattern = &cast<AddrPattern>(*param);
         Nonnull<BindingPattern*> binding =
             &cast<BindingPattern>(addr_pattern->binding());
-        if (binding->name() != "me") {
+        if (binding->name() != "self") {
           return ProgramError(source_loc)
                  << "illegal binding pattern in implicit parameter list";
         }
-        if (result.me_pattern.has_value()) {
+        if (result.self_pattern.has_value()) {
           return ProgramError(source_loc)
-                 << "parameter list cannot contain more than one `me` "
+                 << "parameter list cannot contain more than one `self` "
                     "parameter";
         }
-        result.me_pattern = addr_pattern;
+        result.self_pattern = addr_pattern;
         break;
       }
       default:
@@ -333,7 +333,7 @@ auto DestructorDeclaration::CreateDestructor(
                           SplitDeducedParameters(source_loc, deduced_params));
   return arena->New<DestructorDeclaration>(
       source_loc, std::move(split_params.resolved_params),
-      split_params.me_pattern, param_pattern, return_term, body);
+      split_params.self_pattern, param_pattern, return_term, body);
 }
 
 auto FunctionDeclaration::Create(Nonnull<Arena*> arena,
@@ -348,7 +348,7 @@ auto FunctionDeclaration::Create(Nonnull<Arena*> arena,
                           SplitDeducedParameters(source_loc, deduced_params));
   return arena->New<FunctionDeclaration>(
       source_loc, name, std::move(split_params.resolved_params),
-      split_params.me_pattern, param_pattern, return_term, body);
+      split_params.self_pattern, param_pattern, return_term, body);
 }
 
 void CallableDeclaration::PrintDepth(int depth, llvm::raw_ostream& out) const {
diff --git a/explorer/ast/declaration.h b/explorer/ast/declaration.h
index cd8a2a759e89..bcb6bac5dc1e 100644
--- a/explorer/ast/declaration.h
+++ b/explorer/ast/declaration.h
@@ -129,14 +129,14 @@ class CallableDeclaration : public Declaration {
  public:
   CallableDeclaration(AstNodeKind kind, SourceLocation loc, std::string name,
                       std::vector<Nonnull<GenericBinding*>> deduced_params,
-                      std::optional<Nonnull<Pattern*>> me_pattern,
+                      std::optional<Nonnull<Pattern*>> self_pattern,
                       Nonnull<TuplePattern*> param_pattern,
                       ReturnTerm return_term,
                       std::optional<Nonnull<Block*>> body)
       : Declaration(kind, loc),
         name_(std::move(name)),
         deduced_parameters_(std::move(deduced_params)),
-        me_pattern_(me_pattern),
+        self_pattern_(self_pattern),
         param_pattern_(param_pattern),
         return_term_(return_term),
         body_(body) {}
@@ -152,8 +152,8 @@ class CallableDeclaration : public Declaration {
   auto deduced_parameters() -> llvm::ArrayRef<Nonnull<GenericBinding*>> {
     return deduced_parameters_;
   }
-  auto me_pattern() const -> const Pattern& { return **me_pattern_; }
-  auto me_pattern() -> Pattern& { return **me_pattern_; }
+  auto self_pattern() const -> const Pattern& { return **self_pattern_; }
+  auto self_pattern() -> Pattern& { return **self_pattern_; }
   auto param_pattern() const -> const TuplePattern& { return *param_pattern_; }
   auto param_pattern() -> TuplePattern& { return *param_pattern_; }
   auto return_term() const -> const ReturnTerm& { return return_term_; }
@@ -163,12 +163,12 @@ class CallableDeclaration : public Declaration {
 
   auto value_category() const -> ValueCategory { return ValueCategory::Let; }
 
-  auto is_method() const -> bool { return me_pattern_.has_value(); }
+  auto is_method() const -> bool { return self_pattern_.has_value(); }
 
  private:
   std::string name_;
   std::vector<Nonnull<GenericBinding*>> deduced_parameters_;
-  std::optional<Nonnull<Pattern*>> me_pattern_;
+  std::optional<Nonnull<Pattern*>> self_pattern_;
   Nonnull<TuplePattern*> param_pattern_;
   ReturnTerm return_term_;
   std::optional<Nonnull<Block*>> body_;
@@ -189,13 +189,13 @@ class FunctionDeclaration : public CallableDeclaration {
   // Use `Create()` instead. This is public only so Arena::New() can call it.
   FunctionDeclaration(SourceLocation source_loc, std::string name,
                       std::vector<Nonnull<GenericBinding*>> deduced_params,
-                      std::optional<Nonnull<Pattern*>> me_pattern,
+                      std::optional<Nonnull<Pattern*>> self_pattern,
                       Nonnull<TuplePattern*> param_pattern,
                       ReturnTerm return_term,
                       std::optional<Nonnull<Block*>> body)
       : CallableDeclaration(AstNodeKind::FunctionDeclaration, source_loc,
                             std::move(name), std::move(deduced_params),
-                            me_pattern, param_pattern, return_term, body) {}
+                            self_pattern, param_pattern, return_term, body) {}
 
   static auto classof(const AstNode* node) -> bool {
     return InheritsFromFunctionDeclaration(node->kind());
@@ -216,13 +216,13 @@ class DestructorDeclaration : public CallableDeclaration {
   // Use `Create()` instead. This is public only so Arena::New() can call it.
   DestructorDeclaration(SourceLocation source_loc,
                         std::vector<Nonnull<GenericBinding*>> deduced_params,
-                        std::optional<Nonnull<Pattern*>> me_pattern,
+                        std::optional<Nonnull<Pattern*>> self_pattern,
                         Nonnull<TuplePattern*> param_pattern,
                         ReturnTerm return_term,
                         std::optional<Nonnull<Block*>> body)
       : CallableDeclaration(AstNodeKind::DestructorDeclaration, source_loc,
-                            "destructor", std::move(deduced_params), me_pattern,
-                            param_pattern, return_term, body) {}
+                            "destructor", std::move(deduced_params),
+                            self_pattern, param_pattern, return_term, body) {}
 
   static auto classof(const AstNode* node) -> bool {
     return InheritsFromDestructorDeclaration(node->kind());
diff --git a/explorer/ast/expression.h b/explorer/ast/expression.h
index d9dc7827f6ff..402ac935dbba 100644
--- a/explorer/ast/expression.h
+++ b/explorer/ast/expression.h
@@ -263,7 +263,7 @@ class MemberAccessExpression : public Expression {
   // Can only be called once, during typechecking.
   void set_is_type_access(bool type_access) { is_type_access_ = type_access; }
 
-  // Returns true if the member is a method that has a "me" declaration in an
+  // Returns true if the member is a method that has a "self" declaration in an
   // AddrPattern.
   auto is_addr_me_method() const -> bool { return is_addr_me_method_; }
 
diff --git a/explorer/data/prelude.carbon b/explorer/data/prelude.carbon
index 382acd97eff0..8ad8aaae7809 100644
--- a/explorer/data/prelude.carbon
+++ b/explorer/data/prelude.carbon
@@ -10,7 +10,7 @@ package Carbon api;
 
 // Explicitly convert `Self` to `T`.
 interface As(T:! Type) {
-  fn Convert[me: Self]() -> T;
+  fn Convert[self: Self]() -> T;
 }
 
 // Implicitly convert `Self` to `T`.
@@ -32,30 +32,30 @@ impl forall [U:! Type] U as __EqualConverter where .T = U {
 
 // Every type implicitly converts to single-step-equal types.
 impl forall [T:! Type, U:! Type where .Self == T] T as ImplicitAs(U) {
-  fn Convert[me: Self]() -> U { return __EqualConvert(me, U); }
+  fn Convert[self: Self]() -> U { return __EqualConvert(self, U); }
 }
 
 // TODO: Simplify this once we have variadics.
 // TODO: Should these be final?
 impl forall [U1:! Type, T1:! ImplicitAs(U1)]
     (T1,) as ImplicitAs((U1,)) {
-  fn Convert[me: Self]() -> (U1,) {
-    let (v1: T1,) = me;
+  fn Convert[self: Self]() -> (U1,) {
+    let (v1: T1,) = self;
     return (v1.Convert(),);
   }
 }
 impl forall [U1:! Type, U2:! Type, T1:! ImplicitAs(U1), T2:! ImplicitAs(U2)]
     (T1, T2) as ImplicitAs((U1, U2)) {
-  fn Convert[me: Self]() -> (U1, U2) {
-    let (v1: T1, v2: T2) = me;
+  fn Convert[self: Self]() -> (U1, U2) {
+    let (v1: T1, v2: T2) = self;
     return (v1.Convert(), v2.Convert());
   }
 }
 impl forall [U1:! Type, U2:! Type, U3:! Type,
              T1:! ImplicitAs(U1), T2:! ImplicitAs(U2), T3:! ImplicitAs(U3)]
     (T1, T2, T3) as ImplicitAs((U1, U2, U3)) {
-  fn Convert[me: Self]() -> (U1, U2, U3) {
-    let (v1: T1, v2: T2, v3: T3) = me;
+  fn Convert[self: Self]() -> (U1, U2, U3) {
+    let (v1: T1, v2: T2, v3: T3) = self;
     return (v1.Convert(), v2.Convert(), v3.Convert());
   }
 }
@@ -69,8 +69,8 @@ impl forall [U1:! Type, U2:! Type, U3:! Type,
 // ----------------------
 
 interface EqWith(U:! Type) {
-  fn Equal[me: Self](other: U) -> bool;
-  fn NotEqual[me: Self](other: U) -> bool;
+  fn Equal[self: Self](other: U) -> bool;
+  fn NotEqual[self: Self](other: U) -> bool;
 }
 
 constraint Eq {
@@ -80,44 +80,44 @@ constraint Eq {
 // TODO: Simplify this once we have variadics
 impl forall [T2:! Type, U2:! Type, T1:! EqWith(T2), U1:! EqWith(U2)]
     (T1, U1) as EqWith((T2, U2)) {
-  fn Equal[me: Self](other: (T2, U2)) -> bool {
-    let (l1: T1, l2: U1) = me;
+  fn Equal[self: Self](other: (T2, U2)) -> bool {
+    let (l1: T1, l2: U1) = self;
     let (r1: T2, r2: U2) = other;
     return l1 == r1 and l2 == r2;
   }
-  fn NotEqual[me: Self](other: (T2, U2)) -> bool {
-      let (l1: T1, l2: U1) = me;
+  fn NotEqual[self: Self](other: (T2, U2)) -> bool {
+      let (l1: T1, l2: U1) = self;
       let (r1: T2, r2: U2) = other;
       return l1 != r1 or l2 != r2;
     }
 }
 
 impl bool as EqWith(Self) {
-  fn Equal[me: Self](other: Self) -> bool {
-    return if me then other else not other;
+  fn Equal[self: Self](other: Self) -> bool {
+    return if self then other else not other;
   }
-  fn NotEqual[me: Self](other: Self) -> bool {
-    return if me then not other else other;
+  fn NotEqual[self: Self](other: Self) -> bool {
+    return if self then not other else other;
   }
 }
 
 impl i32 as EqWith(Self) {
-  fn Equal[me: Self](other: Self) -> bool {
-    return __intrinsic_int_eq(me, other);
+  fn Equal[self: Self](other: Self) -> bool {
+    return __intrinsic_int_eq(self, other);
   }
 
-  fn NotEqual[me: Self](other: Self) -> bool {
-    return not __intrinsic_int_eq(me, other);
+  fn NotEqual[self: Self](other: Self) -> bool {
+    return not __intrinsic_int_eq(self, other);
   }
 }
 
 impl String as EqWith(Self) {
-  fn Equal[me: Self](other: Self) -> bool {
-    return __intrinsic_str_eq(me, other);
+  fn Equal[self: Self](other: Self) -> bool {
+    return __intrinsic_str_eq(self, other);
   }
 
-  fn NotEqual[me: Self](other: Self) -> bool {
-    return not __intrinsic_str_eq(me, other);
+  fn NotEqual[self: Self](other: Self) -> bool {
+    return not __intrinsic_str_eq(self, other);
   }
 }
 
@@ -134,7 +134,7 @@ choice Ordering {
 
 // TODO: Per the design, this should be named `OrderedWith`.
 interface CompareWith(U:! Type) {
-  fn Compare[me: Self](u: U) -> Ordering;
+  fn Compare[self: Self](u: U) -> Ordering;
   // TODO: Add `default fn` for Less, LessOrEquivalent, Greater, and GreaterOrEquivalent once it's available.
 }
 constraint Ordered {
@@ -142,8 +142,8 @@ constraint Ordered {
 }
 
 impl i32 as CompareWith(Self) {
-  fn Compare[me: Self](other: Self) -> Ordering {
-    var comp: i32 = __intrinsic_int_compare(me, other);
+  fn Compare[self: Self](other: Self) -> Ordering {
+    var comp: i32 = __intrinsic_int_compare(self, other);
     if (comp == -1) {
       return Ordering.Less();
     }
@@ -159,8 +159,8 @@ impl i32 as CompareWith(Self) {
 }
 
 impl String as CompareWith(Self) {
-  fn Compare[me: Self](other: Self) -> Ordering {
-    var comp: i32 = __intrinsic_str_compare(me, other);
+  fn Compare[self: Self](other: Self) -> Ordering {
+    var comp: i32 = __intrinsic_str_compare(self, other);
     if (comp == -1) {
       return Ordering.Less();
     }
@@ -175,24 +175,24 @@ impl String as CompareWith(Self) {
 }
 
 interface LessWith(U:! Type) {
-  fn Less[me: Self](other: U) -> bool;
+  fn Less[self: Self](other: U) -> bool;
 }
 
 interface LessEqWith(U:! Type) {
-  fn LessEq[me: Self](other: U) -> bool;
+  fn LessEq[self: Self](other: U) -> bool;
 }
 
 interface GreaterWith(U:! Type) {
-  fn Greater[me: Self](other: U) -> bool;
+  fn Greater[self: Self](other: U) -> bool;
 }
 
 interface GreaterEqWith(U:! Type) {
-  fn GreaterEq[me: Self](other: U) -> bool;
+  fn GreaterEq[self: Self](other: U) -> bool;
 }
 
 impl i32 as LessWith(Self) {
-  fn Less[me: Self](other: Self) -> bool {
-    var comp: Ordering = me.(CompareWith(i32).Compare)(other);
+  fn Less[self: Self](other: Self) -> bool {
+    var comp: Ordering = self.(CompareWith(i32).Compare)(other);
     match (comp) {
       case Ordering.Less() => {
         return true;
@@ -203,8 +203,8 @@ impl i32 as LessWith(Self) {
 }
 
 impl String as LessWith(Self) {
-  fn Less[me: Self](other: Self) -> bool {
-    var comp: Ordering =  me.(CompareWith(String).Compare)(other);
+  fn Less[self: Self](other: Self) -> bool {
+    var comp: Ordering =  self.(CompareWith(String).Compare)(other);
     match(comp){
       case Ordering.Less() => {
         return true;
@@ -215,8 +215,8 @@ impl String as LessWith(Self) {
 }
 
 impl i32 as LessEqWith(Self) {
-  fn LessEq[me: Self](other: Self) -> bool {
-    var comp: Ordering =  me.(CompareWith(i32).Compare)(other);
+  fn LessEq[self: Self](other: Self) -> bool {
+    var comp: Ordering =  self.(CompareWith(i32).Compare)(other);
     match(comp){
       case Ordering.Less() => {
         return true;
@@ -230,8 +230,8 @@ impl i32 as LessEqWith(Self) {
 }
 
 impl String as LessEqWith(Self) {
-  fn LessEq[me: Self](other: Self) -> bool {
-    var comp: Ordering =  me.(CompareWith(String).Compare)(other);
+  fn LessEq[self: Self](other: Self) -> bool {
+    var comp: Ordering =  self.(CompareWith(String).Compare)(other);
     match(comp){
       case Ordering.Less() => {
         return true;
@@ -245,8 +245,8 @@ impl String as LessEqWith(Self) {
 }
 
 impl i32 as GreaterWith(Self) {
-  fn Greater[me: Self](other: Self) -> bool {
-    var comp: Ordering =  me.(CompareWith(i32).Compare)(other);
+  fn Greater[self: Self](other: Self) -> bool {
+    var comp: Ordering =  self.(CompareWith(i32).Compare)(other);
     match(comp){
       case Ordering.Greater() => {
         return true;
@@ -257,8 +257,8 @@ impl i32 as GreaterWith(Self) {
 }
 
 impl String as GreaterWith(Self) {
-  fn Greater[me: Self](other: Self) -> bool {
-    var comp: Ordering =  me.(CompareWith(String).Compare)(other);
+  fn Greater[self: Self](other: Self) -> bool {
+    var comp: Ordering =  self.(CompareWith(String).Compare)(other);
     match(comp){
       case Ordering.Greater() => {
         return true;
@@ -269,8 +269,8 @@ impl String as GreaterWith(Self) {
 }
 
 impl i32 as GreaterEqWith(Self) {
-  fn GreaterEq[me: Self](other: Self) -> bool {
-    var comp: Ordering =  me.(CompareWith(i32).Compare)(other);
+  fn GreaterEq[self: Self](other: Self) -> bool {
+    var comp: Ordering =  self.(CompareWith(i32).Compare)(other);
     match(comp){
       case Ordering.Greater() => {
         return true;
@@ -284,8 +284,8 @@ impl i32 as GreaterEqWith(Self) {
 }
 
 impl String as GreaterEqWith(Self) {
-  fn GreaterEq[me: Self](other: Self) -> bool {
-    var comp: Ordering =  me.(CompareWith(String).Compare)(other);
+  fn GreaterEq[self: Self](other: Self) -> bool {
+    var comp: Ordering =  self.(CompareWith(String).Compare)(other);
     match(comp){
       case Ordering.Greater() => {
         return true;
@@ -305,13 +305,13 @@ impl String as GreaterEqWith(Self) {
 interface Negate {
   // TODO: = Self
   let Result:! Type;
-  fn Op[me: Self]() -> Result;
+  fn Op[self: Self]() -> Result;
 }
 
 interface AddWith(U:! Type) {
   // TODO: = Self
   let Result:! Type;
-  fn Op[me: Self](other: U) -> Result;
+  fn Op[self: Self](other: U) -> Result;
 }
 constraint Add {
   extends AddWith(Self) where .Result = Self;
@@ -320,7 +320,7 @@ constraint Add {
 interface SubWith(U:! Type) {
   // TODO: = Self
   let Result:! Type;
-  fn Op[me: Self](other: U) -> Result;
+  fn Op[self: Self](other: U) -> Result;
 }
 constraint Sub {
   extends SubWith(Self) where .Result = Self;
@@ -329,7 +329,7 @@ constraint Sub {
 interface MulWith(U:! Type) {
   // TODO: = Self
   let Result:! Type;
-  fn Op[me: Self](other: U) -> Result;
+  fn Op[self: Self](other: U) -> Result;
 }
 constraint Mul {
   extends MulWith(Self) where .Result = Self;
@@ -338,7 +338,7 @@ constraint Mul {
 interface DivWith(U:! Type) {
   // TODO: = Self
   let Result:! Type;
-  fn Op[me: Self](other: U) -> Result;
+  fn Op[self: Self](other: U) -> Result;
 }
 constraint Div {
   extends DivWith(Self) where .Result = Self;
@@ -347,7 +347,7 @@ constraint Div {
 interface ModWith(U:! Type) {
   // TODO: = Self
   let Result:! Type;
-  fn Op[me: Self](other: U) -> Result;
+  fn Op[self: Self](other: U) -> Result;
 }
 constraint Mod {
   extends ModWith(Self) where .Result = Self;
@@ -355,22 +355,22 @@ constraint Mod {
 
 // Note, these impls use the builtin addition for i32.
 external impl i32 as Negate where .Result = i32 {
-  fn Op[me: i32]() -> i32 { return -me; }
+  fn Op[self: i32]() -> i32 { return -self; }
 }
 external impl i32 as AddWith(i32) where .Result = i32 {
-  fn Op[me: i32](other: i32) -> i32 { return me + other; }
+  fn Op[self: i32](other: i32) -> i32 { return self + other; }
 }
 external impl i32 as SubWith(i32) where .Result = i32 {
-  fn Op[me: i32](other: i32) -> i32 { return me - other; }
+  fn Op[self: i32](other: i32) -> i32 { return self - other; }
 }
 external impl i32 as MulWith(i32) where .Result = i32 {
-  fn Op[me: i32](other: i32) -> i32 { return me * other; }
+  fn Op[self: i32](other: i32) -> i32 { return self * other; }
 }
 external impl i32 as DivWith(i32) where .Result = i32 {
-  fn Op[me: i32](other: i32) -> i32 { return me / other; }
+  fn Op[self: i32](other: i32) -> i32 { return self / other; }
 }
 external impl i32 as ModWith(i32) where .Result = i32 {
-  fn Op[me: i32](other: i32) -> i32 { return me % other; }
+  fn Op[self: i32](other: i32) -> i32 { return self % other; }
 }
 
 // ---------------------------------
@@ -381,14 +381,14 @@ external impl i32 as ModWith(i32) where .Result = i32 {
 interface BitComplement {
   // TODO: = Self
   let Result:! Type;
-  fn Op[me: Self]() -> Result;
+  fn Op[self: Self]() -> Result;
 }
 
 // Binary `&`.
 interface BitAndWith(U:! Type) {
   // TODO: = Self
   let Result:! Type;
-  fn Op[me: Self](other: U) -> Result;
+  fn Op[self: Self](other: U) -> Result;
 }
 constraint BitAnd {
   extends BitAndWith(Self) where .Result = Self;
@@ -398,7 +398,7 @@ constraint BitAnd {
 interface BitOrWith(U:! Type) {
   // TODO: = Self
   let Result:! Type;
-  fn Op[me: Self](other: U) -> Result;
+  fn Op[self: Self](other: U) -> Result;
 }
 constraint BitOr {
   extends BitOrWith(Self) where .Result = Self;
@@ -408,7 +408,7 @@ constraint BitOr {
 interface BitXorWith(U:! Type) {
   // TODO: = Self
   let Result:! Type;
-  fn Op[me: Self](other: U) -> Result;
+  fn Op[self: Self](other: U) -> Result;
 }
 constraint BitXor {
   extends BitXorWith(Self) where .Result = Self;
@@ -418,7 +418,7 @@ constraint BitXor {
 interface LeftShiftWith(U:! Type) {
   // TODO: = Self
   let Result:! Type;
-  fn Op[me: Self](other: U) -> Result;
+  fn Op[self: Self](other: U) -> Result;
 }
 constraint LeftShift {
   extends LeftShiftWith(Self) where .Result = Self;
@@ -428,40 +428,40 @@ constraint LeftShift {
 interface RightShiftWith(U:! Type) {
   // TODO: = Self
   let Result:! Type;
-  fn Op[me: Self](other: U) -> Result;
+  fn Op[self: Self](other: U) -> Result;
 }
 constraint RightShift {
   extends RightShiftWith(Self) where .Result = Self;
 }
 
 external impl i32 as BitComplement where .Result = i32 {
-  fn Op[me: i32]() -> i32 {
-    return __intrinsic_int_bit_complement(me);
+  fn Op[self: i32]() -> i32 {
+    return __intrinsic_int_bit_complement(self);
   }
 }
 external impl i32 as BitAndWith(i32) where .Result = i32 {
-  fn Op[me: i32](other: i32) -> i32 {
-    return __intrinsic_int_bit_and(me, other);
+  fn Op[self: i32](other: i32) -> i32 {
+    return __intrinsic_int_bit_and(self, other);
   }
 }
 external impl i32 as BitOrWith(i32) where .Result = i32 {
-  fn Op[me: i32](other: i32) -> i32 {
-    return __intrinsic_int_bit_or(me, other);
+  fn Op[self: i32](other: i32) -> i32 {
+    return __intrinsic_int_bit_or(self, other);
   }
 }
 external impl i32 as BitXorWith(i32) where .Result = i32 {
-  fn Op[me: i32](other: i32) -> i32 {
-    return __intrinsic_int_bit_xor(me, other);
+  fn Op[self: i32](other: i32) -> i32 {
+    return __intrinsic_int_bit_xor(self, other);
   }
 }
 external impl i32 as LeftShiftWith(i32) where .Result = i32 {
-  fn Op[me: i32](other: i32) -> i32 {
-    return __intrinsic_int_left_shift(me, other);
+  fn Op[self: i32](other: i32) -> i32 {
+    return __intrinsic_int_left_shift(self, other);
   }
 }
 external impl i32 as RightShiftWith(i32) where .Result = i32 {
-  fn Op[me: i32](other: i32) -> i32 {
-    return __intrinsic_int_right_shift(me, other);
+  fn Op[self: i32](other: i32) -> i32 {
+    return __intrinsic_int_right_shift(self, other);
   }
 }
 
@@ -481,16 +481,16 @@ class Optional(T:! Type) {
     return {.element = OptionalElement(T).Element(value)};
   }
 
-  fn HasValue[me: Self]() -> bool {
-    match(me.element) {
+  fn HasValue[self: Self]() -> bool {
+    match(self.element) {
       case OptionalElement(T).None() => { return false; }
     }
     return true;
   }
 
-  fn Get[me: Self]() -> T {
+  fn Get[self: Self]() -> T {
     var y: T;
-    match(me.element) {
+    match(self.element) {
       case OptionalElement(T).Element(x: T) => {
         return x;
       }
@@ -522,10 +522,10 @@ fn Rand(low: i32, high: i32) -> i32{
 }
 
 class Heap {
-  fn New[T:! Type, me: Self](x : T) -> T* {
+  fn New[T:! Type, self: Self](x : T) -> T* {
     return __intrinsic_new(x);
   }
-  fn Delete[T:! Type, me: Self](p : T*) {
+  fn Delete[T:! Type, self: Self](p : T*) {
     __intrinsic_delete(p);
   }
 }
diff --git a/explorer/fuzzing/ast_to_proto.cpp b/explorer/fuzzing/ast_to_proto.cpp
index 13089939cc83..abad621b4a11 100644
--- a/explorer/fuzzing/ast_to_proto.cpp
+++ b/explorer/fuzzing/ast_to_proto.cpp
@@ -584,21 +584,22 @@ static auto DeclarationToProto(const Declaration& declaration)
       const auto& function = cast<DestructorDeclaration>(declaration);
       auto* function_proto = declaration_proto.mutable_destructor();
       if (function.is_method()) {
-        switch (function.me_pattern().kind()) {
+        switch (function.self_pattern().kind()) {
           case PatternKind::AddrPattern:
-            *function_proto->mutable_me_pattern() =
-                PatternToProto(cast<AddrPattern>(function.me_pattern()));
+            *function_proto->mutable_self_pattern() =
+                PatternToProto(cast<AddrPattern>(function.self_pattern()));
             break;
           case PatternKind::BindingPattern:
-            *function_proto->mutable_me_pattern() =
-                PatternToProto(cast<BindingPattern>(function.me_pattern()));
+            *function_proto->mutable_self_pattern() =
+                PatternToProto(cast<BindingPattern>(function.self_pattern()));
             break;
           default:
-            // Parser shouldn't allow me_pattern to be anything other than
+            // Parser shouldn't allow self_pattern to be anything other than
             // AddrPattern or BindingPattern
-            CARBON_FATAL() << "me_pattern in method declaration can be either "
-                              "AddrPattern or BindingPattern. Actual pattern: "
-                           << function.me_pattern();
+            CARBON_FATAL()
+                << "self_pattern in method declaration can be either "
+                   "AddrPattern or BindingPattern. Actual pattern: "
+                << function.self_pattern();
             break;
         }
       }
@@ -619,21 +620,22 @@ static auto DeclarationToProto(const Declaration& declaration)
             GenericBindingToProto(*binding);
       }
       if (function.is_method()) {
-        switch (function.me_pattern().kind()) {
+        switch (function.self_pattern().kind()) {
           case PatternKind::AddrPattern:
-            *function_proto->mutable_me_pattern() =
-                PatternToProto(cast<AddrPattern>(function.me_pattern()));
+            *function_proto->mutable_self_pattern() =
+                PatternToProto(cast<AddrPattern>(function.self_pattern()));
             break;
           case PatternKind::BindingPattern:
-            *function_proto->mutable_me_pattern() =
-                PatternToProto(cast<BindingPattern>(function.me_pattern()));
+            *function_proto->mutable_self_pattern() =
+                PatternToProto(cast<BindingPattern>(function.self_pattern()));
             break;
           default:
-            // Parser shouldn't allow me_pattern to be anything other than
+            // Parser shouldn't allow self_pattern to be anything other than
             // AddrPattern or BindingPattern
-            CARBON_FATAL() << "me_pattern in method declaration can be either "
-                              "AddrPattern or BindingPattern. Actual pattern: "
-                           << function.me_pattern();
+            CARBON_FATAL()
+                << "self_pattern in method declaration can be either "
+                   "AddrPattern or BindingPattern. Actual pattern: "
+                << function.self_pattern();
             break;
         }
       }
diff --git a/explorer/fuzzing/fuzzer_corpus/631d05bfebd6b0cd3a47061fc6efea2d776d1b5f b/explorer/fuzzing/fuzzer_corpus/00725179de0aa71c7343d00281a8b4e881755cd1
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/631d05bfebd6b0cd3a47061fc6efea2d776d1b5f
rename to explorer/fuzzing/fuzzer_corpus/00725179de0aa71c7343d00281a8b4e881755cd1
index f1aee4344698..038eae8e5f07 100644
--- a/explorer/fuzzing/fuzzer_corpus/631d05bfebd6b0cd3a47061fc6efea2d776d1b5f
+++ b/explorer/fuzzing/fuzzer_corpus/00725179de0aa71c7343d00281a8b4e881755cd1
@@ -9,9 +9,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -52,9 +52,9 @@ compilation_unit {
       members {
         function {
           name: "Scale"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -189,9 +189,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -242,7 +242,7 @@ compilation_unit {
                               field: "x"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
@@ -270,7 +270,7 @@ compilation_unit {
                               field: "y"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
@@ -298,9 +298,9 @@ compilation_unit {
       members {
         function {
           name: "Scale"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -350,7 +350,7 @@ compilation_unit {
                               field: "x"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
@@ -373,7 +373,7 @@ compilation_unit {
                               field: "y"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
@@ -437,9 +437,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -480,7 +480,7 @@ compilation_unit {
               return_expression_statement {
                 expression {
                   identifier {
-                    name: "me"
+                    name: "self"
                   }
                 }
               }
@@ -491,9 +491,9 @@ compilation_unit {
       members {
         function {
           name: "Scale"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -534,7 +534,7 @@ compilation_unit {
               return_expression_statement {
                 expression {
                   identifier {
-                    name: "me"
+                    name: "self"
                   }
                 }
               }
diff --git a/explorer/fuzzing/fuzzer_corpus/651fffb6d15a8e1c5f58862c49fa95d4eb950df9 b/explorer/fuzzing/fuzzer_corpus/0628004dd8a25e850a804fb21da38644e9734e1d
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/651fffb6d15a8e1c5f58862c49fa95d4eb950df9
rename to explorer/fuzzing/fuzzer_corpus/0628004dd8a25e850a804fb21da38644e9734e1d
index 0696b08f2c47..3400f72af459 100644
--- a/explorer/fuzzing/fuzzer_corpus/651fffb6d15a8e1c5f58862c49fa95d4eb950df9
+++ b/explorer/fuzzing/fuzzer_corpus/0628004dd8a25e850a804fb21da38644e9734e1d
@@ -77,9 +77,9 @@ compilation_unit {
       members {
         function {
           name: "GetX"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -122,7 +122,7 @@ compilation_unit {
                     field: "x"
                     object {
                       identifier {
-                        name: "me"
+                        name: "self"
                       }
                     }
                   }
diff --git a/explorer/fuzzing/fuzzer_corpus/2b883d07bdf4c2db174e4ffa42993d1ffad01815 b/explorer/fuzzing/fuzzer_corpus/0645e2adb589c5d5c2ea84e31b87db1ee74034ee
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/2b883d07bdf4c2db174e4ffa42993d1ffad01815
rename to explorer/fuzzing/fuzzer_corpus/0645e2adb589c5d5c2ea84e31b87db1ee74034ee
index b55f7f1f5886..29e8dfad152c 100644
--- a/explorer/fuzzing/fuzzer_corpus/2b883d07bdf4c2db174e4ffa42993d1ffad01815
+++ b/explorer/fuzzing/fuzzer_corpus/0645e2adb589c5d5c2ea84e31b87db1ee74034ee
@@ -9,9 +9,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -52,9 +52,9 @@ compilation_unit {
       members {
         function {
           name: "Scale"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -149,9 +149,9 @@ compilation_unit {
           members {
             function {
               name: "Add"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -202,7 +202,7 @@ compilation_unit {
                                   field: "x"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -230,7 +230,7 @@ compilation_unit {
                                   field: "y"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -258,9 +258,9 @@ compilation_unit {
           members {
             function {
               name: "Scale"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -310,7 +310,7 @@ compilation_unit {
                                   field: "x"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -333,7 +333,7 @@ compilation_unit {
                                   field: "y"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -406,9 +406,9 @@ compilation_unit {
           members {
             function {
               name: "Add"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -462,7 +462,7 @@ compilation_unit {
                                       field: "x"
                                       object {
                                         identifier {
-                                          name: "me"
+                                          name: "self"
                                         }
                                       }
                                     }
@@ -500,7 +500,7 @@ compilation_unit {
                                       field: "y"
                                       object {
                                         identifier {
-                                          name: "me"
+                                          name: "self"
                                         }
                                       }
                                     }
@@ -535,9 +535,9 @@ compilation_unit {
           members {
             function {
               name: "Scale"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -590,7 +590,7 @@ compilation_unit {
                                       field: "x"
                                       object {
                                         identifier {
-                                          name: "me"
+                                          name: "self"
                                         }
                                       }
                                     }
@@ -623,7 +623,7 @@ compilation_unit {
                                       field: "y"
                                       object {
                                         identifier {
-                                          name: "me"
+                                          name: "self"
                                         }
                                       }
                                     }
diff --git a/explorer/fuzzing/fuzzer_corpus/f3b273f5d4718498b6d06baef8fa44b7a14476be b/explorer/fuzzing/fuzzer_corpus/0b574f5827b34d81e951ea5477244a2ec1d23b8c
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/f3b273f5d4718498b6d06baef8fa44b7a14476be
rename to explorer/fuzzing/fuzzer_corpus/0b574f5827b34d81e951ea5477244a2ec1d23b8c
index a0835722e8fb..87d663798b66 100644
--- a/explorer/fuzzing/fuzzer_corpus/f3b273f5d4718498b6d06baef8fa44b7a14476be
+++ b/explorer/fuzzing/fuzzer_corpus/0b574f5827b34d81e951ea5477244a2ec1d23b8c
@@ -51,9 +51,9 @@ compilation_unit {
       members {
         function {
           name: "Convert"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -84,7 +84,7 @@ compilation_unit {
                       name: "n"
                       expression {
                         identifier {
-                          name: "me"
+                          name: "self"
                         }
                       }
                     }
diff --git a/explorer/fuzzing/fuzzer_corpus/329852da9d25572d3551a281f4fce0852ece2534 b/explorer/fuzzing/fuzzer_corpus/0d4c01e620d71b76277d1e1f20d4238766eb6932
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/329852da9d25572d3551a281f4fce0852ece2534
rename to explorer/fuzzing/fuzzer_corpus/0d4c01e620d71b76277d1e1f20d4238766eb6932
index 78d6504a3fca..a2cd00cc9671 100644
--- a/explorer/fuzzing/fuzzer_corpus/329852da9d25572d3551a281f4fce0852ece2534
+++ b/explorer/fuzzing/fuzzer_corpus/0d4c01e620d71b76277d1e1f20d4238766eb6932
@@ -45,9 +45,9 @@ compilation_unit {
       members {
         function {
           name: "Equal"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -96,7 +96,7 @@ compilation_unit {
                             field: "x"
                             object {
                               identifier {
-                                name: "me"
+                                name: "self"
                               }
                             }
                           }
@@ -121,7 +121,7 @@ compilation_unit {
                             field: "y"
                             object {
                               identifier {
-                                name: "me"
+                                name: "self"
                               }
                             }
                           }
diff --git a/explorer/fuzzing/fuzzer_corpus/653708e15ee3faf059b918f581abff432d21cdaf b/explorer/fuzzing/fuzzer_corpus/0d6963786d58523dfc5e68326f6efd08fd1b2ea4
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/653708e15ee3faf059b918f581abff432d21cdaf
rename to explorer/fuzzing/fuzzer_corpus/0d6963786d58523dfc5e68326f6efd08fd1b2ea4
index 2d9f56652ad6..57b6f9e56c63 100644
--- a/explorer/fuzzing/fuzzer_corpus/653708e15ee3faf059b918f581abff432d21cdaf
+++ b/explorer/fuzzing/fuzzer_corpus/0d6963786d58523dfc5e68326f6efd08fd1b2ea4
@@ -50,9 +50,9 @@ compilation_unit {
           members {
             function {
               name: "Equal"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -98,7 +98,7 @@ compilation_unit {
                             field: "value"
                             object {
                               identifier {
-                                name: "me"
+                                name: "self"
                               }
                             }
                           }
diff --git a/explorer/fuzzing/fuzzer_corpus/61906ca73c6e3deb1f1650ae9a5f7470464c7116 b/explorer/fuzzing/fuzzer_corpus/0e06d7c74d2b9659b8ce114a93e3a4fbc1d22a5b
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/61906ca73c6e3deb1f1650ae9a5f7470464c7116
rename to explorer/fuzzing/fuzzer_corpus/0e06d7c74d2b9659b8ce114a93e3a4fbc1d22a5b
index 0bfb9b729705..11a5b0351d87 100644
--- a/explorer/fuzzing/fuzzer_corpus/61906ca73c6e3deb1f1650ae9a5f7470464c7116
+++ b/explorer/fuzzing/fuzzer_corpus/0e06d7c74d2b9659b8ce114a93e3a4fbc1d22a5b
@@ -69,9 +69,9 @@ compilation_unit {
       members {
         function {
           name: "Op"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -121,7 +121,7 @@ compilation_unit {
                               field: "n"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
diff --git a/explorer/fuzzing/fuzzer_corpus/07281c243ec05c00152d6c076768adf1243065e6 b/explorer/fuzzing/fuzzer_corpus/0e4dd54cbc641eb28c41d49f2e94d185a83bb36f
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/07281c243ec05c00152d6c076768adf1243065e6
rename to explorer/fuzzing/fuzzer_corpus/0e4dd54cbc641eb28c41d49f2e94d185a83bb36f
index 2f8e42c3477c..eed061e03b08 100644
--- a/explorer/fuzzing/fuzzer_corpus/07281c243ec05c00152d6c076768adf1243065e6
+++ b/explorer/fuzzing/fuzzer_corpus/0e4dd54cbc641eb28c41d49f2e94d185a83bb36f
@@ -34,9 +34,9 @@ compilation_unit {
           members {
             function {
               name: "Convert"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -105,9 +105,9 @@ compilation_unit {
           members {
             function {
               name: "Convert"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -176,9 +176,9 @@ compilation_unit {
           members {
             function {
               name: "Convert"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -207,7 +207,7 @@ compilation_unit {
                         field: "n"
                         object {
                           identifier {
-                            name: "me"
+                            name: "self"
                           }
                         }
                       }
diff --git a/explorer/fuzzing/fuzzer_corpus/bab53bf6f729c963fcb37cae13a3f74a68ffcab1 b/explorer/fuzzing/fuzzer_corpus/117921e41437507de0b91e32012a76cdb9ba0c9a
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/bab53bf6f729c963fcb37cae13a3f74a68ffcab1
rename to explorer/fuzzing/fuzzer_corpus/117921e41437507de0b91e32012a76cdb9ba0c9a
index a7b094a043ea..30779f61a647 100644
--- a/explorer/fuzzing/fuzzer_corpus/bab53bf6f729c963fcb37cae13a3f74a68ffcab1
+++ b/explorer/fuzzing/fuzzer_corpus/117921e41437507de0b91e32012a76cdb9ba0c9a
@@ -24,9 +24,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -391,9 +391,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -434,7 +434,7 @@ compilation_unit {
                     op: Add
                     arguments {
                       identifier {
-                        name: "me"
+                        name: "self"
                       }
                     }
                     arguments {
diff --git a/explorer/fuzzing/fuzzer_corpus/123b2a5baad3b9975bd241845fd936e600c55aaa b/explorer/fuzzing/fuzzer_corpus/1791a58953862700da2eb1b1372b10d82366a250
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/123b2a5baad3b9975bd241845fd936e600c55aaa
rename to explorer/fuzzing/fuzzer_corpus/1791a58953862700da2eb1b1372b10d82366a250
index 82f546ae4ef7..33c77f441f9b 100644
--- a/explorer/fuzzing/fuzzer_corpus/123b2a5baad3b9975bd241845fd936e600c55aaa
+++ b/explorer/fuzzing/fuzzer_corpus/1791a58953862700da2eb1b1372b10d82366a250
@@ -90,9 +90,9 @@ compilation_unit {
       members {
         function {
           name: "GetX"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -148,7 +148,7 @@ compilation_unit {
                     field: "x"
                     object {
                       identifier {
-                        name: "me"
+                        name: "self"
                       }
                     }
                   }
diff --git a/explorer/fuzzing/fuzzer_corpus/b08b2be746979e7162058fecc045d779f29ccafb b/explorer/fuzzing/fuzzer_corpus/1a0ec7a6bc5b1202b3c7218ccf0b34374a79b601
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/b08b2be746979e7162058fecc045d779f29ccafb
rename to explorer/fuzzing/fuzzer_corpus/1a0ec7a6bc5b1202b3c7218ccf0b34374a79b601
index 7d0a7f5b3eef..d2eb62302fe3 100644
--- a/explorer/fuzzing/fuzzer_corpus/b08b2be746979e7162058fecc045d779f29ccafb
+++ b/explorer/fuzzing/fuzzer_corpus/1a0ec7a6bc5b1202b3c7218ccf0b34374a79b601
@@ -24,9 +24,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -242,9 +242,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -285,7 +285,7 @@ compilation_unit {
                     op: Add
                     arguments {
                       identifier {
-                        name: "me"
+                        name: "self"
                       }
                     }
                     arguments {
diff --git a/explorer/fuzzing/fuzzer_corpus/44016232b2a7dad2f134b97acd279ed221246ced b/explorer/fuzzing/fuzzer_corpus/26db64985a757f7b85a8dec0687537da313e3ab9
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/44016232b2a7dad2f134b97acd279ed221246ced
rename to explorer/fuzzing/fuzzer_corpus/26db64985a757f7b85a8dec0687537da313e3ab9
index c7b15f12106e..93a85e820493 100644
--- a/explorer/fuzzing/fuzzer_corpus/44016232b2a7dad2f134b97acd279ed221246ced
+++ b/explorer/fuzzing/fuzzer_corpus/26db64985a757f7b85a8dec0687537da313e3ab9
@@ -9,9 +9,9 @@ compilation_unit {
       members {
         function {
           name: "Op"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -124,9 +124,9 @@ compilation_unit {
       members {
         function {
           name: "Op"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -173,7 +173,7 @@ compilation_unit {
                         op: Mul
                         arguments {
                           identifier {
-                            name: "me"
+                            name: "self"
                           }
                         }
                         arguments {
diff --git a/explorer/fuzzing/fuzzer_corpus/09bfdb72621215dcf457b12c78d419e390e35ff3 b/explorer/fuzzing/fuzzer_corpus/2707aba6bd4e18dee9a06c5b7a9d3888c95744aa
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/09bfdb72621215dcf457b12c78d419e390e35ff3
rename to explorer/fuzzing/fuzzer_corpus/2707aba6bd4e18dee9a06c5b7a9d3888c95744aa
index 34ca98ec3a62..1ce4e0fcf871 100644
--- a/explorer/fuzzing/fuzzer_corpus/09bfdb72621215dcf457b12c78d419e390e35ff3
+++ b/explorer/fuzzing/fuzzer_corpus/2707aba6bd4e18dee9a06c5b7a9d3888c95744aa
@@ -69,9 +69,9 @@ compilation_unit {
       members {
         function {
           name: "Get"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -101,7 +101,7 @@ compilation_unit {
                     field: "data"
                     object {
                       identifier {
-                        name: "me"
+                        name: "self"
                       }
                     }
                   }
@@ -114,10 +114,10 @@ compilation_unit {
       members {
         function {
           name: "Put"
-          me_pattern {
+          self_pattern {
             addr_pattern {
               binding_pattern {
-                name: "me"
+                name: "self"
                 type {
                   expression_pattern {
                     expression {
@@ -165,7 +165,7 @@ compilation_unit {
                         op: Deref
                         arguments {
                           identifier {
-                            name: "me"
+                            name: "self"
                           }
                         }
                       }
@@ -192,9 +192,9 @@ compilation_unit {
               }
             }
           }
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
diff --git a/explorer/fuzzing/fuzzer_corpus/ea0609a3d2aa3d758f47497050c93e247a0cbfd5 b/explorer/fuzzing/fuzzer_corpus/2728279e53d9502d0660d640ba26c615dd8ebe13
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/ea0609a3d2aa3d758f47497050c93e247a0cbfd5
rename to explorer/fuzzing/fuzzer_corpus/2728279e53d9502d0660d640ba26c615dd8ebe13
index 78e2b9b31bbd..35cbfbc21508 100644
--- a/explorer/fuzzing/fuzzer_corpus/ea0609a3d2aa3d758f47497050c93e247a0cbfd5
+++ b/explorer/fuzzing/fuzzer_corpus/2728279e53d9502d0660d640ba26c615dd8ebe13
@@ -69,9 +69,9 @@ compilation_unit {
       members {
         function {
           name: "Op"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -121,7 +121,7 @@ compilation_unit {
                               field: "n"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
diff --git a/explorer/fuzzing/fuzzer_corpus/6c13d857e3a677208e4f0879c63181e96b56927a b/explorer/fuzzing/fuzzer_corpus/2ccfd82373462cdd54eb11ff6eb0c71d47bb07c5
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/6c13d857e3a677208e4f0879c63181e96b56927a
rename to explorer/fuzzing/fuzzer_corpus/2ccfd82373462cdd54eb11ff6eb0c71d47bb07c5
index ece4b86d66aa..8b3a537900be 100644
--- a/explorer/fuzzing/fuzzer_corpus/6c13d857e3a677208e4f0879c63181e96b56927a
+++ b/explorer/fuzzing/fuzzer_corpus/2ccfd82373462cdd54eb11ff6eb0c71d47bb07c5
@@ -24,9 +24,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -162,9 +162,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -205,7 +205,7 @@ compilation_unit {
                     op: Add
                     arguments {
                       identifier {
-                        name: "me"
+                        name: "self"
                       }
                     }
                     arguments {
@@ -318,9 +318,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -373,7 +373,7 @@ compilation_unit {
                                   field: "x"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -409,7 +409,7 @@ compilation_unit {
                                   field: "y"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
diff --git a/explorer/fuzzing/fuzzer_corpus/0365a66b097b7c504a3b78ebe1cb3ca297ad8e14 b/explorer/fuzzing/fuzzer_corpus/2d212c330ab39e4ad5cffeed456bae14a8385c09
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/0365a66b097b7c504a3b78ebe1cb3ca297ad8e14
rename to explorer/fuzzing/fuzzer_corpus/2d212c330ab39e4ad5cffeed456bae14a8385c09
index 3e2b3b86b058..5330b61b05c2 100644
--- a/explorer/fuzzing/fuzzer_corpus/0365a66b097b7c504a3b78ebe1cb3ca297ad8e14
+++ b/explorer/fuzzing/fuzzer_corpus/2d212c330ab39e4ad5cffeed456bae14a8385c09
@@ -50,9 +50,9 @@ compilation_unit {
       members {
         function {
           name: "GetX"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -81,7 +81,7 @@ compilation_unit {
                     field: "x"
                     object {
                       identifier {
-                        name: "me"
+                        name: "self"
                       }
                     }
                   }
diff --git a/explorer/fuzzing/fuzzer_corpus/8e46852a08cb3b0e3e97446339b7e86c8f7758b9 b/explorer/fuzzing/fuzzer_corpus/3131bb7cd777c8112ea2f2221f1b4624d55b191e
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/8e46852a08cb3b0e3e97446339b7e86c8f7758b9
rename to explorer/fuzzing/fuzzer_corpus/3131bb7cd777c8112ea2f2221f1b4624d55b191e
index 87823fe50c25..c8278d3e4086 100644
--- a/explorer/fuzzing/fuzzer_corpus/8e46852a08cb3b0e3e97446339b7e86c8f7758b9
+++ b/explorer/fuzzing/fuzzer_corpus/3131bb7cd777c8112ea2f2221f1b4624d55b191e
@@ -9,9 +9,9 @@ compilation_unit {
       members {
         function {
           name: "F"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -77,9 +77,9 @@ compilation_unit {
           members {
             function {
               name: "F"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -130,7 +130,7 @@ compilation_unit {
                                   field: "n"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -221,9 +221,9 @@ compilation_unit {
           members {
             function {
               name: "Convert"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -257,7 +257,7 @@ compilation_unit {
                               field: "m"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
diff --git a/explorer/fuzzing/fuzzer_corpus/2ec468114a962bc61ddd735888caecb69d767a13 b/explorer/fuzzing/fuzzer_corpus/3453c49a9e56c74c0a4f27ab89d926019282f8d4
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/2ec468114a962bc61ddd735888caecb69d767a13
rename to explorer/fuzzing/fuzzer_corpus/3453c49a9e56c74c0a4f27ab89d926019282f8d4
index 3697d2c130f3..078dbb36daca 100644
--- a/explorer/fuzzing/fuzzer_corpus/2ec468114a962bc61ddd735888caecb69d767a13
+++ b/explorer/fuzzing/fuzzer_corpus/3453c49a9e56c74c0a4f27ab89d926019282f8d4
@@ -50,9 +50,9 @@ compilation_unit {
       members {
         function {
           name: "GetX"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -81,7 +81,7 @@ compilation_unit {
                     field: "x"
                     object {
                       identifier {
-                        name: "me"
+                        name: "self"
                       }
                     }
                   }
diff --git a/explorer/fuzzing/fuzzer_corpus/eed9a8047e9e1d6baba1b3418cda8a46bc6dc98c b/explorer/fuzzing/fuzzer_corpus/36a2d32d4f486e410ce1d93b17556a459902a8db
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/eed9a8047e9e1d6baba1b3418cda8a46bc6dc98c
rename to explorer/fuzzing/fuzzer_corpus/36a2d32d4f486e410ce1d93b17556a459902a8db
index 4c5b49d0a0e5..4eb4f28e44f5 100644
--- a/explorer/fuzzing/fuzzer_corpus/eed9a8047e9e1d6baba1b3418cda8a46bc6dc98c
+++ b/explorer/fuzzing/fuzzer_corpus/36a2d32d4f486e410ce1d93b17556a459902a8db
@@ -9,9 +9,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -52,9 +52,9 @@ compilation_unit {
       members {
         function {
           name: "Scale"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -151,9 +151,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -204,7 +204,7 @@ compilation_unit {
                               field: "x"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
@@ -232,7 +232,7 @@ compilation_unit {
                               field: "y"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
@@ -260,9 +260,9 @@ compilation_unit {
       members {
         function {
           name: "Scale"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -312,7 +312,7 @@ compilation_unit {
                               field: "x"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
@@ -335,7 +335,7 @@ compilation_unit {
                               field: "y"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
diff --git a/explorer/fuzzing/fuzzer_corpus/2f88d1825e7b0e71cb625b8ab1beaecd174cd0f8 b/explorer/fuzzing/fuzzer_corpus/37152a1f5e181bd2c1fd48c3548547efa925c5a4
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/2f88d1825e7b0e71cb625b8ab1beaecd174cd0f8
rename to explorer/fuzzing/fuzzer_corpus/37152a1f5e181bd2c1fd48c3548547efa925c5a4
index af64c73f49f8..5ed75583ade6 100644
--- a/explorer/fuzzing/fuzzer_corpus/2f88d1825e7b0e71cb625b8ab1beaecd174cd0f8
+++ b/explorer/fuzzing/fuzzer_corpus/37152a1f5e181bd2c1fd48c3548547efa925c5a4
@@ -24,9 +24,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -67,9 +67,9 @@ compilation_unit {
       members {
         function {
           name: "Scale"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -205,9 +205,9 @@ compilation_unit {
           members {
             function {
               name: "Add"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -258,7 +258,7 @@ compilation_unit {
                                   field: "x"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -286,7 +286,7 @@ compilation_unit {
                                   field: "y"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -314,9 +314,9 @@ compilation_unit {
           members {
             function {
               name: "Scale"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -366,7 +366,7 @@ compilation_unit {
                                   field: "x"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -389,7 +389,7 @@ compilation_unit {
                                   field: "y"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
diff --git a/explorer/fuzzing/fuzzer_corpus/463459b2095f2fe51a780ba4f241546683342030 b/explorer/fuzzing/fuzzer_corpus/3e01369a9e8cf3f970c089945ec276bcbeede55c
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/463459b2095f2fe51a780ba4f241546683342030
rename to explorer/fuzzing/fuzzer_corpus/3e01369a9e8cf3f970c089945ec276bcbeede55c
index 61e22b0c3c45..6fa69fdea8e9 100644
--- a/explorer/fuzzing/fuzzer_corpus/463459b2095f2fe51a780ba4f241546683342030
+++ b/explorer/fuzzing/fuzzer_corpus/3e01369a9e8cf3f970c089945ec276bcbeede55c
@@ -9,9 +9,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -52,9 +52,9 @@ compilation_unit {
       members {
         function {
           name: "Scale"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -149,9 +149,9 @@ compilation_unit {
           members {
             function {
               name: "Add"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -202,7 +202,7 @@ compilation_unit {
                                   field: "x"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -230,7 +230,7 @@ compilation_unit {
                                   field: "y"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -258,9 +258,9 @@ compilation_unit {
           members {
             function {
               name: "Scale"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -310,7 +310,7 @@ compilation_unit {
                                   field: "x"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -333,7 +333,7 @@ compilation_unit {
                                   field: "y"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
diff --git a/explorer/fuzzing/fuzzer_corpus/fea1ce88ab8d7768650399ad06d44177513c4e20 b/explorer/fuzzing/fuzzer_corpus/3f7bb85bd8057570d53cd4c3fe81bfd439acdd0a
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/fea1ce88ab8d7768650399ad06d44177513c4e20
rename to explorer/fuzzing/fuzzer_corpus/3f7bb85bd8057570d53cd4c3fe81bfd439acdd0a
index 37f6c0becc71..2f8ad5bfeb92 100644
--- a/explorer/fuzzing/fuzzer_corpus/fea1ce88ab8d7768650399ad06d44177513c4e20
+++ b/explorer/fuzzing/fuzzer_corpus/3f7bb85bd8057570d53cd4c3fe81bfd439acdd0a
@@ -50,10 +50,10 @@ compilation_unit {
       members {
         function {
           name: "GetSetX"
-          me_pattern {
+          self_pattern {
             addr_pattern {
               binding_pattern {
-                name: "me"
+                name: "self"
                 type {
                   expression_pattern {
                     expression {
@@ -113,7 +113,7 @@ compilation_unit {
                         op: Deref
                         arguments {
                           identifier {
-                            name: "me"
+                            name: "self"
                           }
                         }
                       }
@@ -133,7 +133,7 @@ compilation_unit {
                         op: Deref
                         arguments {
                           identifier {
-                            name: "me"
+                            name: "self"
                           }
                         }
                       }
diff --git a/explorer/fuzzing/fuzzer_corpus/6c1759300095598a38caba72e0ba091e3678602e b/explorer/fuzzing/fuzzer_corpus/40db19330f5238fc82719e45fa0e8297974ed182
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/6c1759300095598a38caba72e0ba091e3678602e
rename to explorer/fuzzing/fuzzer_corpus/40db19330f5238fc82719e45fa0e8297974ed182
index 7e96c37a5b4c..e20865444f11 100644
--- a/explorer/fuzzing/fuzzer_corpus/6c1759300095598a38caba72e0ba091e3678602e
+++ b/explorer/fuzzing/fuzzer_corpus/40db19330f5238fc82719e45fa0e8297974ed182
@@ -51,9 +51,9 @@ compilation_unit {
       members {
         function {
           name: "Convert"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -82,7 +82,7 @@ compilation_unit {
                     field: "n"
                     object {
                       identifier {
-                        name: "me"
+                        name: "self"
                       }
                     }
                   }
diff --git a/explorer/fuzzing/fuzzer_corpus/afcfa1c92cf7625ad7a5356c16810d25499a35c2 b/explorer/fuzzing/fuzzer_corpus/47c1f4fc527c9a4a4c6cd4e313ac2e29555066cb
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/afcfa1c92cf7625ad7a5356c16810d25499a35c2
rename to explorer/fuzzing/fuzzer_corpus/47c1f4fc527c9a4a4c6cd4e313ac2e29555066cb
index 7b2941c4ddb7..43e48d4d70e0 100644
--- a/explorer/fuzzing/fuzzer_corpus/afcfa1c92cf7625ad7a5356c16810d25499a35c2
+++ b/explorer/fuzzing/fuzzer_corpus/47c1f4fc527c9a4a4c6cd4e313ac2e29555066cb
@@ -70,10 +70,10 @@ compilation_unit {
       members {
         function {
           name: "GetSetX"
-          me_pattern {
+          self_pattern {
             addr_pattern {
               binding_pattern {
-                name: "me"
+                name: "self"
                 type {
                   expression_pattern {
                     expression {
@@ -133,7 +133,7 @@ compilation_unit {
                         op: Deref
                         arguments {
                           identifier {
-                            name: "me"
+                            name: "self"
                           }
                         }
                       }
@@ -153,7 +153,7 @@ compilation_unit {
                         op: Deref
                         arguments {
                           identifier {
-                            name: "me"
+                            name: "self"
                           }
                         }
                       }
diff --git a/explorer/fuzzing/fuzzer_corpus/3f36b86f130c66e151ab96490cfb530a5ea32f52 b/explorer/fuzzing/fuzzer_corpus/48f9d3769404e19f8a70776360bade0822e2082c
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/3f36b86f130c66e151ab96490cfb530a5ea32f52
rename to explorer/fuzzing/fuzzer_corpus/48f9d3769404e19f8a70776360bade0822e2082c
index 8e672e64b601..feda93d607e8 100644
--- a/explorer/fuzzing/fuzzer_corpus/3f36b86f130c66e151ab96490cfb530a5ea32f52
+++ b/explorer/fuzzing/fuzzer_corpus/48f9d3769404e19f8a70776360bade0822e2082c
@@ -34,9 +34,9 @@ compilation_unit {
           members {
             function {
               name: "Convert"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -65,7 +65,7 @@ compilation_unit {
                         field: "n"
                         object {
                           identifier {
-                            name: "me"
+                            name: "self"
                           }
                         }
                       }
diff --git a/explorer/fuzzing/fuzzer_corpus/36170fc5efef82cc7db909323cca1c914df5c3e8 b/explorer/fuzzing/fuzzer_corpus/4d41ecad50244310db98271c3707cef0b04bc97b
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/36170fc5efef82cc7db909323cca1c914df5c3e8
rename to explorer/fuzzing/fuzzer_corpus/4d41ecad50244310db98271c3707cef0b04bc97b
index 57e3a2779034..64942348b496 100644
--- a/explorer/fuzzing/fuzzer_corpus/36170fc5efef82cc7db909323cca1c914df5c3e8
+++ b/explorer/fuzzing/fuzzer_corpus/4d41ecad50244310db98271c3707cef0b04bc97b
@@ -9,9 +9,9 @@ compilation_unit {
       members {
         function {
           name: "Op"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -84,9 +84,9 @@ compilation_unit {
       members {
         function {
           name: "Op"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -133,7 +133,7 @@ compilation_unit {
                         op: Mul
                         arguments {
                           identifier {
-                            name: "me"
+                            name: "self"
                           }
                         }
                         arguments {
diff --git a/explorer/fuzzing/fuzzer_corpus/7925d780a840fd84fe05274a99fc48ebc4197d0f b/explorer/fuzzing/fuzzer_corpus/4fa346a44b96db2ad5cfe3c2ad505d893114843c
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/7925d780a840fd84fe05274a99fc48ebc4197d0f
rename to explorer/fuzzing/fuzzer_corpus/4fa346a44b96db2ad5cfe3c2ad505d893114843c
index 4bdcad59ec62..b2a63feda4bb 100644
--- a/explorer/fuzzing/fuzzer_corpus/7925d780a840fd84fe05274a99fc48ebc4197d0f
+++ b/explorer/fuzzing/fuzzer_corpus/4fa346a44b96db2ad5cfe3c2ad505d893114843c
@@ -9,9 +9,9 @@ compilation_unit {
       members {
         function {
           name: "F"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -62,9 +62,9 @@ compilation_unit {
           members {
             function {
               name: "F"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
diff --git a/explorer/fuzzing/fuzzer_corpus/fb1419c561f37a9bcec76471a5d4a63dfdf9ddda b/explorer/fuzzing/fuzzer_corpus/5090b9a0b3c3ffbc56868aec59170a189673a98a
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/fb1419c561f37a9bcec76471a5d4a63dfdf9ddda
rename to explorer/fuzzing/fuzzer_corpus/5090b9a0b3c3ffbc56868aec59170a189673a98a
index 58a3cf92ab47..cce912e4d93c 100644
--- a/explorer/fuzzing/fuzzer_corpus/fb1419c561f37a9bcec76471a5d4a63dfdf9ddda
+++ b/explorer/fuzzing/fuzzer_corpus/5090b9a0b3c3ffbc56868aec59170a189673a98a
@@ -9,9 +9,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -52,9 +52,9 @@ compilation_unit {
       members {
         function {
           name: "Scale"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -149,9 +149,9 @@ compilation_unit {
           members {
             function {
               name: "Add"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -202,7 +202,7 @@ compilation_unit {
                                   field: "x"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -230,7 +230,7 @@ compilation_unit {
                                   field: "y"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -258,9 +258,9 @@ compilation_unit {
           members {
             function {
               name: "Scale"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -310,7 +310,7 @@ compilation_unit {
                                   field: "x"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -333,7 +333,7 @@ compilation_unit {
                                   field: "y"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
diff --git a/explorer/fuzzing/fuzzer_corpus/d6c33799ef1a296eb42a1f0b7aecb1cef098a605 b/explorer/fuzzing/fuzzer_corpus/5269bae96f6771c6ae4ba67e36b7f66fda42daea
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/d6c33799ef1a296eb42a1f0b7aecb1cef098a605
rename to explorer/fuzzing/fuzzer_corpus/5269bae96f6771c6ae4ba67e36b7f66fda42daea
index 853f847ba402..ee620aea603f 100644
--- a/explorer/fuzzing/fuzzer_corpus/d6c33799ef1a296eb42a1f0b7aecb1cef098a605
+++ b/explorer/fuzzing/fuzzer_corpus/5269bae96f6771c6ae4ba67e36b7f66fda42daea
@@ -6,9 +6,9 @@ compilation_unit {
   declarations {
     function {
       name: "F"
-      me_pattern {
+      self_pattern {
         binding_pattern {
-          name: "me"
+          name: "self"
           type {
             expression_pattern {
               expression {
diff --git a/explorer/fuzzing/fuzzer_corpus/3a474b4f07864125949f0ad5c1e9f1d2bdab5f61 b/explorer/fuzzing/fuzzer_corpus/53ca8c76d3cb30196eeff9b8117a5bf5ecd5ffea
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/3a474b4f07864125949f0ad5c1e9f1d2bdab5f61
rename to explorer/fuzzing/fuzzer_corpus/53ca8c76d3cb30196eeff9b8117a5bf5ecd5ffea
index 34859db3facd..dc61764cb003 100644
--- a/explorer/fuzzing/fuzzer_corpus/3a474b4f07864125949f0ad5c1e9f1d2bdab5f61
+++ b/explorer/fuzzing/fuzzer_corpus/53ca8c76d3cb30196eeff9b8117a5bf5ecd5ffea
@@ -69,9 +69,9 @@ compilation_unit {
       members {
         function {
           name: "Op"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -121,7 +121,7 @@ compilation_unit {
                               field: "n"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
diff --git a/explorer/fuzzing/fuzzer_corpus/cf779a4c902fb75c8b1cf85acdbd1d3f0f0fe653 b/explorer/fuzzing/fuzzer_corpus/548312593165d1b8bfa24117a94ab5dce977df4d
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/cf779a4c902fb75c8b1cf85acdbd1d3f0f0fe653
rename to explorer/fuzzing/fuzzer_corpus/548312593165d1b8bfa24117a94ab5dce977df4d
index 502d9a09620d..5ffc10b29ed3 100644
--- a/explorer/fuzzing/fuzzer_corpus/cf779a4c902fb75c8b1cf85acdbd1d3f0f0fe653
+++ b/explorer/fuzzing/fuzzer_corpus/548312593165d1b8bfa24117a94ab5dce977df4d
@@ -9,9 +9,9 @@ compilation_unit {
       members {
         function {
           name: "Go"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -76,9 +76,9 @@ compilation_unit {
       members {
         function {
           name: "Go"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
diff --git a/explorer/fuzzing/fuzzer_corpus/8baa022df7b9c840038a529f9eb795b6b48a03be b/explorer/fuzzing/fuzzer_corpus/563bee2ef50a868465e6161ebe820288f905cbb7
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/8baa022df7b9c840038a529f9eb795b6b48a03be
rename to explorer/fuzzing/fuzzer_corpus/563bee2ef50a868465e6161ebe820288f905cbb7
index a36b838718f3..cfe577cfbf46 100644
--- a/explorer/fuzzing/fuzzer_corpus/8baa022df7b9c840038a529f9eb795b6b48a03be
+++ b/explorer/fuzzing/fuzzer_corpus/563bee2ef50a868465e6161ebe820288f905cbb7
@@ -9,9 +9,9 @@ compilation_unit {
       members {
         function {
           name: "Get"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
diff --git a/explorer/fuzzing/fuzzer_corpus/8bf2b8d725f56e603a8d82ea54a481a6f68be7fb b/explorer/fuzzing/fuzzer_corpus/5751f95809ae96f25cc7a80764bf204a5ab173e6
similarity index 96%
rename from explorer/fuzzing/fuzzer_corpus/8bf2b8d725f56e603a8d82ea54a481a6f68be7fb
rename to explorer/fuzzing/fuzzer_corpus/5751f95809ae96f25cc7a80764bf204a5ab173e6
index c9f34589240f..094bffc850d5 100644
--- a/explorer/fuzzing/fuzzer_corpus/8bf2b8d725f56e603a8d82ea54a481a6f68be7fb
+++ b/explorer/fuzzing/fuzzer_corpus/5751f95809ae96f25cc7a80764bf204a5ab173e6
@@ -22,9 +22,9 @@ compilation_unit {
       members {
         function {
           name: "F"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -198,9 +198,9 @@ compilation_unit {
           members {
             function {
               name: "Convert"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -229,7 +229,7 @@ compilation_unit {
                         field: "val"
                         object {
                           identifier {
-                            name: "me"
+                            name: "self"
                           }
                         }
                       }
@@ -276,9 +276,9 @@ compilation_unit {
       members {
         function {
           name: "F"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -309,7 +309,7 @@ compilation_unit {
                       name: "val"
                       expression {
                         identifier {
-                          name: "me"
+                          name: "self"
                         }
                       }
                     }
diff --git a/explorer/fuzzing/fuzzer_corpus/560fd1959c1732a2eec83ee7bcc6639f5fcd2d5c b/explorer/fuzzing/fuzzer_corpus/57d2c890c2c3bf9d7e028a46d7ddce6deee5c2aa
similarity index 99%
rename from explorer/fuzzing/fuzzer_corpus/560fd1959c1732a2eec83ee7bcc6639f5fcd2d5c
rename to explorer/fuzzing/fuzzer_corpus/57d2c890c2c3bf9d7e028a46d7ddce6deee5c2aa
index 72ea9b12b0e9..d8bcb271459d 100644
--- a/explorer/fuzzing/fuzzer_corpus/560fd1959c1732a2eec83ee7bcc6639f5fcd2d5c
+++ b/explorer/fuzzing/fuzzer_corpus/57d2c890c2c3bf9d7e028a46d7ddce6deee5c2aa
@@ -36,9 +36,9 @@ compilation_unit {
       members {
         function {
           name: "Convert"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
diff --git a/explorer/fuzzing/fuzzer_corpus/4ed62c38f4c6ad4bb83573935838dff3c9aad127 b/explorer/fuzzing/fuzzer_corpus/587f9e61674de6917f39a998a4f94e932fa3d028
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/4ed62c38f4c6ad4bb83573935838dff3c9aad127
rename to explorer/fuzzing/fuzzer_corpus/587f9e61674de6917f39a998a4f94e932fa3d028
index 4453c3f3a6bb..d50c7e30345b 100644
--- a/explorer/fuzzing/fuzzer_corpus/4ed62c38f4c6ad4bb83573935838dff3c9aad127
+++ b/explorer/fuzzing/fuzzer_corpus/587f9e61674de6917f39a998a4f94e932fa3d028
@@ -24,9 +24,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -162,9 +162,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -205,7 +205,7 @@ compilation_unit {
                     op: Add
                     arguments {
                       identifier {
-                        name: "me"
+                        name: "self"
                       }
                     }
                     arguments {
@@ -331,9 +331,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -425,7 +425,7 @@ compilation_unit {
                                   field: "x"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -461,7 +461,7 @@ compilation_unit {
                                   field: "y"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
diff --git a/explorer/fuzzing/fuzzer_corpus/4fdbadb3f068229c55d2b62cf7ebd45faeb1143f b/explorer/fuzzing/fuzzer_corpus/5880e23795708e905d50bc8e9e0d62ac9a5f42bc
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/4fdbadb3f068229c55d2b62cf7ebd45faeb1143f
rename to explorer/fuzzing/fuzzer_corpus/5880e23795708e905d50bc8e9e0d62ac9a5f42bc
index afaeaf9877be..28f01772fb36 100644
--- a/explorer/fuzzing/fuzzer_corpus/4fdbadb3f068229c55d2b62cf7ebd45faeb1143f
+++ b/explorer/fuzzing/fuzzer_corpus/5880e23795708e905d50bc8e9e0d62ac9a5f42bc
@@ -24,10 +24,10 @@ compilation_unit {
       members {
         function {
           name: "GetSetX"
-          me_pattern {
+          self_pattern {
             addr_pattern {
               binding_pattern {
-                name: "me"
+                name: "self"
                 type {
                   expression_pattern {
                     expression {
@@ -87,7 +87,7 @@ compilation_unit {
                         op: Deref
                         arguments {
                           identifier {
-                            name: "me"
+                            name: "self"
                           }
                         }
                       }
@@ -107,7 +107,7 @@ compilation_unit {
                         op: Deref
                         arguments {
                           identifier {
-                            name: "me"
+                            name: "self"
                           }
                         }
                       }
diff --git a/explorer/fuzzing/fuzzer_corpus/999821a3d97439a1236c401db4d87f3dae77b4f5 b/explorer/fuzzing/fuzzer_corpus/5bbfea7599c4d80c75ef4780a6ed6df8bce2da8f
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/999821a3d97439a1236c401db4d87f3dae77b4f5
rename to explorer/fuzzing/fuzzer_corpus/5bbfea7599c4d80c75ef4780a6ed6df8bce2da8f
index 09aae3d01f12..7a180f8adac8 100644
--- a/explorer/fuzzing/fuzzer_corpus/999821a3d97439a1236c401db4d87f3dae77b4f5
+++ b/explorer/fuzzing/fuzzer_corpus/5bbfea7599c4d80c75ef4780a6ed6df8bce2da8f
@@ -69,9 +69,9 @@ compilation_unit {
       members {
         function {
           name: "Op"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -121,7 +121,7 @@ compilation_unit {
                               field: "n"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
diff --git a/explorer/fuzzing/fuzzer_corpus/59d8a9bedcfef28a632a6b3bd855c7f441387135 b/explorer/fuzzing/fuzzer_corpus/5bd05de92a0614fd1b2821395bedcc8eb548161d
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/59d8a9bedcfef28a632a6b3bd855c7f441387135
rename to explorer/fuzzing/fuzzer_corpus/5bd05de92a0614fd1b2821395bedcc8eb548161d
index 20df0cf1f223..cdc183b72d56 100644
--- a/explorer/fuzzing/fuzzer_corpus/59d8a9bedcfef28a632a6b3bd855c7f441387135
+++ b/explorer/fuzzing/fuzzer_corpus/5bd05de92a0614fd1b2821395bedcc8eb548161d
@@ -45,9 +45,9 @@ compilation_unit {
       members {
         function {
           name: "Equal"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -96,7 +96,7 @@ compilation_unit {
                             field: "x"
                             object {
                               identifier {
-                                name: "me"
+                                name: "self"
                               }
                             }
                           }
@@ -121,7 +121,7 @@ compilation_unit {
                             field: "y"
                             object {
                               identifier {
-                                name: "me"
+                                name: "self"
                               }
                             }
                           }
diff --git a/explorer/fuzzing/fuzzer_corpus/c808c2c70d0ad416b35ca653e6e908aa95fdcbdc b/explorer/fuzzing/fuzzer_corpus/5c737d5839a3ca0db8b0f112dd693420a707b8e5
similarity index 96%
rename from explorer/fuzzing/fuzzer_corpus/c808c2c70d0ad416b35ca653e6e908aa95fdcbdc
rename to explorer/fuzzing/fuzzer_corpus/5c737d5839a3ca0db8b0f112dd693420a707b8e5
index b8f46c8f5226..921bac2d0d59 100644
--- a/explorer/fuzzing/fuzzer_corpus/c808c2c70d0ad416b35ca653e6e908aa95fdcbdc
+++ b/explorer/fuzzing/fuzzer_corpus/5c737d5839a3ca0db8b0f112dd693420a707b8e5
@@ -9,9 +9,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -52,9 +52,9 @@ compilation_unit {
       members {
         function {
           name: "Scale"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -151,9 +151,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -204,7 +204,7 @@ compilation_unit {
                               field: "x"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
@@ -232,7 +232,7 @@ compilation_unit {
                               field: "y"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
@@ -260,9 +260,9 @@ compilation_unit {
       members {
         function {
           name: "Scale"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -312,7 +312,7 @@ compilation_unit {
                               field: "x"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
@@ -335,7 +335,7 @@ compilation_unit {
                               field: "y"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
@@ -373,9 +373,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -426,7 +426,7 @@ compilation_unit {
                               field: "x"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
@@ -454,7 +454,7 @@ compilation_unit {
                               field: "y"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
@@ -482,9 +482,9 @@ compilation_unit {
       members {
         function {
           name: "Scale"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -534,7 +534,7 @@ compilation_unit {
                               field: "x"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
@@ -557,7 +557,7 @@ compilation_unit {
                               field: "y"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
diff --git a/explorer/fuzzing/fuzzer_corpus/49b57fa298aea0184f8ab9aeda83c5f3e8f8ab13 b/explorer/fuzzing/fuzzer_corpus/5e059c72b3fbba74b9c3cb7a21be19d36467f6f9
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/49b57fa298aea0184f8ab9aeda83c5f3e8f8ab13
rename to explorer/fuzzing/fuzzer_corpus/5e059c72b3fbba74b9c3cb7a21be19d36467f6f9
index c96835708f66..80b18744c47b 100644
--- a/explorer/fuzzing/fuzzer_corpus/49b57fa298aea0184f8ab9aeda83c5f3e8f8ab13
+++ b/explorer/fuzzing/fuzzer_corpus/5e059c72b3fbba74b9c3cb7a21be19d36467f6f9
@@ -82,9 +82,9 @@ compilation_unit {
       members {
         function {
           name: "GetX"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -132,7 +132,7 @@ compilation_unit {
                     field: "x"
                     object {
                       identifier {
-                        name: "me"
+                        name: "self"
                       }
                     }
                   }
diff --git a/explorer/fuzzing/fuzzer_corpus/58ca4b8b4be539d1cd33fd1f41dab8fb7fddfe67 b/explorer/fuzzing/fuzzer_corpus/5face9a218209d4da098180061d730d861b81e89
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/58ca4b8b4be539d1cd33fd1f41dab8fb7fddfe67
rename to explorer/fuzzing/fuzzer_corpus/5face9a218209d4da098180061d730d861b81e89
index 8d519ad245f1..e803eef30c3f 100644
--- a/explorer/fuzzing/fuzzer_corpus/58ca4b8b4be539d1cd33fd1f41dab8fb7fddfe67
+++ b/explorer/fuzzing/fuzzer_corpus/5face9a218209d4da098180061d730d861b81e89
@@ -50,9 +50,9 @@ compilation_unit {
       members {
         function {
           name: "GetX"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -81,7 +81,7 @@ compilation_unit {
                     field: "x"
                     object {
                       identifier {
-                        name: "me"
+                        name: "self"
                       }
                     }
                   }
diff --git a/explorer/fuzzing/fuzzer_corpus/8d59ad4812195d59b1813caa8c6feac199c24ed8 b/explorer/fuzzing/fuzzer_corpus/60cb95fa0986cc17e934a7014593f76fba70c461
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/8d59ad4812195d59b1813caa8c6feac199c24ed8
rename to explorer/fuzzing/fuzzer_corpus/60cb95fa0986cc17e934a7014593f76fba70c461
index 52374fc78845..72063b33fbad 100644
--- a/explorer/fuzzing/fuzzer_corpus/8d59ad4812195d59b1813caa8c6feac199c24ed8
+++ b/explorer/fuzzing/fuzzer_corpus/60cb95fa0986cc17e934a7014593f76fba70c461
@@ -34,9 +34,9 @@ compilation_unit {
           members {
             function {
               name: "Convert"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
diff --git a/explorer/fuzzing/fuzzer_corpus/c3acb2d65aedcef3302759a6c379c04114c2a7bf b/explorer/fuzzing/fuzzer_corpus/61082aaaa73d240be4b52a732f1631e158927cc7
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/c3acb2d65aedcef3302759a6c379c04114c2a7bf
rename to explorer/fuzzing/fuzzer_corpus/61082aaaa73d240be4b52a732f1631e158927cc7
index 6ea393856aa1..aa2e817a1d44 100644
--- a/explorer/fuzzing/fuzzer_corpus/c3acb2d65aedcef3302759a6c379c04114c2a7bf
+++ b/explorer/fuzzing/fuzzer_corpus/61082aaaa73d240be4b52a732f1631e158927cc7
@@ -77,9 +77,9 @@ compilation_unit {
       members {
         function {
           name: "GetX"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -109,7 +109,7 @@ compilation_unit {
                     field: "x"
                     object {
                       identifier {
-                        name: "me"
+                        name: "self"
                       }
                     }
                   }
diff --git a/explorer/fuzzing/fuzzer_corpus/ac6a41fa211e6c08161392ed1ea9d70aa9c4f6e5 b/explorer/fuzzing/fuzzer_corpus/6516cff3041ce9f5f0ae1ec62ab391c1eb83dec6
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/ac6a41fa211e6c08161392ed1ea9d70aa9c4f6e5
rename to explorer/fuzzing/fuzzer_corpus/6516cff3041ce9f5f0ae1ec62ab391c1eb83dec6
index 775c7b1539b6..0c45ff95c006 100644
--- a/explorer/fuzzing/fuzzer_corpus/ac6a41fa211e6c08161392ed1ea9d70aa9c4f6e5
+++ b/explorer/fuzzing/fuzzer_corpus/6516cff3041ce9f5f0ae1ec62ab391c1eb83dec6
@@ -57,9 +57,9 @@ compilation_unit {
       members {
         function {
           name: "Op"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -96,7 +96,7 @@ compilation_unit {
                               field: "n"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
diff --git a/explorer/fuzzing/fuzzer_corpus/2f0d66e7cdd3b7f810d91d332e5c7e3cc796fbfb b/explorer/fuzzing/fuzzer_corpus/66ebec331ac305442c9fecdbc852080d09861c6e
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/2f0d66e7cdd3b7f810d91d332e5c7e3cc796fbfb
rename to explorer/fuzzing/fuzzer_corpus/66ebec331ac305442c9fecdbc852080d09861c6e
index f9249e6bd58d..f0e1b10b3239 100644
--- a/explorer/fuzzing/fuzzer_corpus/2f0d66e7cdd3b7f810d91d332e5c7e3cc796fbfb
+++ b/explorer/fuzzing/fuzzer_corpus/66ebec331ac305442c9fecdbc852080d09861c6e
@@ -21,9 +21,9 @@ compilation_unit {
       members {
         function {
           name: "G"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
diff --git a/explorer/fuzzing/fuzzer_corpus/62713efded33b4ad6640782143f04d99c8fd608c b/explorer/fuzzing/fuzzer_corpus/6715a67f217226aa888ed4b6768d8206279dd6e3
similarity index 96%
rename from explorer/fuzzing/fuzzer_corpus/62713efded33b4ad6640782143f04d99c8fd608c
rename to explorer/fuzzing/fuzzer_corpus/6715a67f217226aa888ed4b6768d8206279dd6e3
index ea86f342d30f..7ff74f5e1593 100644
--- a/explorer/fuzzing/fuzzer_corpus/62713efded33b4ad6640782143f04d99c8fd608c
+++ b/explorer/fuzzing/fuzzer_corpus/6715a67f217226aa888ed4b6768d8206279dd6e3
@@ -51,9 +51,9 @@ compilation_unit {
       members {
         function {
           name: "Convert"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -84,7 +84,7 @@ compilation_unit {
                       name: "n"
                       expression {
                         identifier {
-                          name: "me"
+                          name: "self"
                         }
                       }
                     }
diff --git a/explorer/fuzzing/fuzzer_corpus/cab6edeb1c182fa58bb76d0482be0fb50985ffd3 b/explorer/fuzzing/fuzzer_corpus/6b0e214022e8279a0f00ac842fea663a7d7bc56e
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/cab6edeb1c182fa58bb76d0482be0fb50985ffd3
rename to explorer/fuzzing/fuzzer_corpus/6b0e214022e8279a0f00ac842fea663a7d7bc56e
index 2b96e4d436bd..2fbbd4c2a7e1 100644
--- a/explorer/fuzzing/fuzzer_corpus/cab6edeb1c182fa58bb76d0482be0fb50985ffd3
+++ b/explorer/fuzzing/fuzzer_corpus/6b0e214022e8279a0f00ac842fea663a7d7bc56e
@@ -9,9 +9,9 @@ compilation_unit {
       members {
         function {
           name: "F"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -77,9 +77,9 @@ compilation_unit {
           members {
             function {
               name: "F"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -130,7 +130,7 @@ compilation_unit {
                                   field: "n"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
diff --git a/explorer/fuzzing/fuzzer_corpus/e73179def3233b31d1d7e3432e17d7fe72827c2a b/explorer/fuzzing/fuzzer_corpus/72dc9d2c26aed0b96a46e93c8e3003cfda8ade56
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/e73179def3233b31d1d7e3432e17d7fe72827c2a
rename to explorer/fuzzing/fuzzer_corpus/72dc9d2c26aed0b96a46e93c8e3003cfda8ade56
index 55308806fc4a..a94b8b711fe6 100644
--- a/explorer/fuzzing/fuzzer_corpus/e73179def3233b31d1d7e3432e17d7fe72827c2a
+++ b/explorer/fuzzing/fuzzer_corpus/72dc9d2c26aed0b96a46e93c8e3003cfda8ade56
@@ -9,9 +9,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -52,9 +52,9 @@ compilation_unit {
       members {
         function {
           name: "Scale"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -151,9 +151,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -204,7 +204,7 @@ compilation_unit {
                               field: "x"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
@@ -232,7 +232,7 @@ compilation_unit {
                               field: "y"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
@@ -260,9 +260,9 @@ compilation_unit {
       members {
         function {
           name: "Scale"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -312,7 +312,7 @@ compilation_unit {
                               field: "x"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
@@ -335,7 +335,7 @@ compilation_unit {
                               field: "y"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
diff --git a/explorer/fuzzing/fuzzer_corpus/ef2a9d01cf810f7877657f6df0ee1c8f781b3ae8 b/explorer/fuzzing/fuzzer_corpus/7739c384b82e7dd2630d7c342173d00b40e4e77c
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/ef2a9d01cf810f7877657f6df0ee1c8f781b3ae8
rename to explorer/fuzzing/fuzzer_corpus/7739c384b82e7dd2630d7c342173d00b40e4e77c
index 9702ee412e0a..689bcdee4279 100644
--- a/explorer/fuzzing/fuzzer_corpus/ef2a9d01cf810f7877657f6df0ee1c8f781b3ae8
+++ b/explorer/fuzzing/fuzzer_corpus/7739c384b82e7dd2630d7c342173d00b40e4e77c
@@ -9,9 +9,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -186,9 +186,9 @@ compilation_unit {
           members {
             function {
               name: "Add"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -239,7 +239,7 @@ compilation_unit {
                                   field: "x"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -267,7 +267,7 @@ compilation_unit {
                                   field: "y"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
diff --git a/explorer/fuzzing/fuzzer_corpus/7bd9386f3d50152ec0aea2d05acfb75e52e8bbc8 b/explorer/fuzzing/fuzzer_corpus/795592079e82d349ba64cf6618596bc9abf88272
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/7bd9386f3d50152ec0aea2d05acfb75e52e8bbc8
rename to explorer/fuzzing/fuzzer_corpus/795592079e82d349ba64cf6618596bc9abf88272
index 6c65a6a2e0e2..168c448043a7 100644
--- a/explorer/fuzzing/fuzzer_corpus/7bd9386f3d50152ec0aea2d05acfb75e52e8bbc8
+++ b/explorer/fuzzing/fuzzer_corpus/795592079e82d349ba64cf6618596bc9abf88272
@@ -9,9 +9,9 @@ compilation_unit {
       members {
         function {
           name: "F"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -62,7 +62,7 @@ compilation_unit {
                               field: "n"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
@@ -151,9 +151,9 @@ compilation_unit {
           members {
             function {
               name: "Convert"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -187,7 +187,7 @@ compilation_unit {
                               field: "m"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
diff --git a/explorer/fuzzing/fuzzer_corpus/7290cd3740061ca743340081004588be481950a0 b/explorer/fuzzing/fuzzer_corpus/7ce654c7dbc1242d117e03ee292315c464c0e50e
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/7290cd3740061ca743340081004588be481950a0
rename to explorer/fuzzing/fuzzer_corpus/7ce654c7dbc1242d117e03ee292315c464c0e50e
index 46d060e4bbe3..9366153011f0 100644
--- a/explorer/fuzzing/fuzzer_corpus/7290cd3740061ca743340081004588be481950a0
+++ b/explorer/fuzzing/fuzzer_corpus/7ce654c7dbc1242d117e03ee292315c464c0e50e
@@ -24,9 +24,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -452,9 +452,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -495,7 +495,7 @@ compilation_unit {
                     op: Add
                     arguments {
                       identifier {
-                        name: "me"
+                        name: "self"
                       }
                     }
                     arguments {
diff --git a/explorer/fuzzing/fuzzer_corpus/df5874ce72c8eb16f502658832ffd18bbef93e8f b/explorer/fuzzing/fuzzer_corpus/7df6280ae4f28302e5e218fd59674f4df02fbf0a
similarity index 99%
rename from explorer/fuzzing/fuzzer_corpus/df5874ce72c8eb16f502658832ffd18bbef93e8f
rename to explorer/fuzzing/fuzzer_corpus/7df6280ae4f28302e5e218fd59674f4df02fbf0a
index b2ffee046306..081550197792 100644
--- a/explorer/fuzzing/fuzzer_corpus/df5874ce72c8eb16f502658832ffd18bbef93e8f
+++ b/explorer/fuzzing/fuzzer_corpus/7df6280ae4f28302e5e218fd59674f4df02fbf0a
@@ -36,9 +36,9 @@ compilation_unit {
       members {
         function {
           name: "Convert"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
diff --git a/explorer/fuzzing/fuzzer_corpus/b9584eaa92b5a9a6dfcd5d9c5ab31436c2eaab56 b/explorer/fuzzing/fuzzer_corpus/83b0b7edd81d74202ec5b6029ec10514cc76b05a
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/b9584eaa92b5a9a6dfcd5d9c5ab31436c2eaab56
rename to explorer/fuzzing/fuzzer_corpus/83b0b7edd81d74202ec5b6029ec10514cc76b05a
index eaed352a9add..819bae070bda 100644
--- a/explorer/fuzzing/fuzzer_corpus/b9584eaa92b5a9a6dfcd5d9c5ab31436c2eaab56
+++ b/explorer/fuzzing/fuzzer_corpus/83b0b7edd81d74202ec5b6029ec10514cc76b05a
@@ -57,9 +57,9 @@ compilation_unit {
       members {
         function {
           name: "Op"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -96,7 +96,7 @@ compilation_unit {
                               field: "n"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
diff --git a/explorer/fuzzing/fuzzer_corpus/859ea021e725bf8c1ea850d2594f7277361415dc b/explorer/fuzzing/fuzzer_corpus/83fe5e68f200c54bdbe2bef8b6368e81f3bf9544
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/859ea021e725bf8c1ea850d2594f7277361415dc
rename to explorer/fuzzing/fuzzer_corpus/83fe5e68f200c54bdbe2bef8b6368e81f3bf9544
index 15ff2a8f34dd..b931985c71fe 100644
--- a/explorer/fuzzing/fuzzer_corpus/859ea021e725bf8c1ea850d2594f7277361415dc
+++ b/explorer/fuzzing/fuzzer_corpus/83fe5e68f200c54bdbe2bef8b6368e81f3bf9544
@@ -30,9 +30,9 @@ compilation_unit {
       members {
         function {
           name: "Equal"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
diff --git a/explorer/fuzzing/fuzzer_corpus/d27a1a2892fb18e817bd5f9e19722e5a1696ff2e b/explorer/fuzzing/fuzzer_corpus/84f58bae012424a5461e9bd7c33efd8cac43a70f
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/d27a1a2892fb18e817bd5f9e19722e5a1696ff2e
rename to explorer/fuzzing/fuzzer_corpus/84f58bae012424a5461e9bd7c33efd8cac43a70f
index b9bce8086a59..a71ed4d0aec0 100644
--- a/explorer/fuzzing/fuzzer_corpus/d27a1a2892fb18e817bd5f9e19722e5a1696ff2e
+++ b/explorer/fuzzing/fuzzer_corpus/84f58bae012424a5461e9bd7c33efd8cac43a70f
@@ -9,9 +9,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -52,9 +52,9 @@ compilation_unit {
       members {
         function {
           name: "Scale"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -149,9 +149,9 @@ compilation_unit {
           members {
             function {
               name: "Add"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -202,7 +202,7 @@ compilation_unit {
                                   field: "x"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -230,7 +230,7 @@ compilation_unit {
                                   field: "y"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
diff --git a/explorer/fuzzing/fuzzer_corpus/53dc2439c30911b52bfbc9bfbe799c7e4687c7d9 b/explorer/fuzzing/fuzzer_corpus/8cc3347e8e6ae3631e051b66067b6763f223f2a0
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/53dc2439c30911b52bfbc9bfbe799c7e4687c7d9
rename to explorer/fuzzing/fuzzer_corpus/8cc3347e8e6ae3631e051b66067b6763f223f2a0
index e65c8d4203be..366f883133d6 100644
--- a/explorer/fuzzing/fuzzer_corpus/53dc2439c30911b52bfbc9bfbe799c7e4687c7d9
+++ b/explorer/fuzzing/fuzzer_corpus/8cc3347e8e6ae3631e051b66067b6763f223f2a0
@@ -69,9 +69,9 @@ compilation_unit {
       members {
         function {
           name: "Op"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -121,7 +121,7 @@ compilation_unit {
                               field: "n"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
diff --git a/explorer/fuzzing/fuzzer_corpus/2b837161326c7b882bbdd46eeab9e54ad90f714d b/explorer/fuzzing/fuzzer_corpus/91d28b3eb682e6191e35c9292d009c5ca616074a
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/2b837161326c7b882bbdd46eeab9e54ad90f714d
rename to explorer/fuzzing/fuzzer_corpus/91d28b3eb682e6191e35c9292d009c5ca616074a
index f2e4e87aa5e0..3b5784bd5701 100644
--- a/explorer/fuzzing/fuzzer_corpus/2b837161326c7b882bbdd46eeab9e54ad90f714d
+++ b/explorer/fuzzing/fuzzer_corpus/91d28b3eb682e6191e35c9292d009c5ca616074a
@@ -9,9 +9,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -52,9 +52,9 @@ compilation_unit {
       members {
         function {
           name: "Scale"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -149,9 +149,9 @@ compilation_unit {
           members {
             function {
               name: "Add"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -202,7 +202,7 @@ compilation_unit {
                                   field: "x"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -230,7 +230,7 @@ compilation_unit {
                                   field: "y"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -258,9 +258,9 @@ compilation_unit {
           members {
             function {
               name: "Scale"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
diff --git a/explorer/fuzzing/fuzzer_corpus/ef0e8f35497f5c70881c2f187e8c2fe11e259524 b/explorer/fuzzing/fuzzer_corpus/91e9c32f3c3bc1ea0693f919f098828ad7860e28
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/ef0e8f35497f5c70881c2f187e8c2fe11e259524
rename to explorer/fuzzing/fuzzer_corpus/91e9c32f3c3bc1ea0693f919f098828ad7860e28
index 8d0c39e2ed86..fa1beb051876 100644
--- a/explorer/fuzzing/fuzzer_corpus/ef0e8f35497f5c70881c2f187e8c2fe11e259524
+++ b/explorer/fuzzing/fuzzer_corpus/91e9c32f3c3bc1ea0693f919f098828ad7860e28
@@ -22,9 +22,9 @@ compilation_unit {
       members {
         function {
           name: "F"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -184,9 +184,9 @@ compilation_unit {
       members {
         function {
           name: "F"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
diff --git a/explorer/fuzzing/fuzzer_corpus/f3e2caaa2ea293093d127d2dd6f43c0827100b77 b/explorer/fuzzing/fuzzer_corpus/94c9bbbf4dad5466e7b504f2268c73ea1c078da3
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/f3e2caaa2ea293093d127d2dd6f43c0827100b77
rename to explorer/fuzzing/fuzzer_corpus/94c9bbbf4dad5466e7b504f2268c73ea1c078da3
index 11d80da88182..1a4a57fb59eb 100644
--- a/explorer/fuzzing/fuzzer_corpus/f3e2caaa2ea293093d127d2dd6f43c0827100b77
+++ b/explorer/fuzzing/fuzzer_corpus/94c9bbbf4dad5466e7b504f2268c73ea1c078da3
@@ -9,9 +9,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -52,9 +52,9 @@ compilation_unit {
       members {
         function {
           name: "Scale"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -149,9 +149,9 @@ compilation_unit {
           members {
             function {
               name: "Add"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -202,7 +202,7 @@ compilation_unit {
                                   field: "x"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -230,7 +230,7 @@ compilation_unit {
                                   field: "y"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -258,9 +258,9 @@ compilation_unit {
           members {
             function {
               name: "Scale"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -310,7 +310,7 @@ compilation_unit {
                                   field: "x"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -333,7 +333,7 @@ compilation_unit {
                                   field: "y"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
diff --git a/explorer/fuzzing/fuzzer_corpus/88162709275c9980ab413687953204f6058c4bc2 b/explorer/fuzzing/fuzzer_corpus/95a9c60ab5e4c36a851c95daf9f4ab05d231616e
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/88162709275c9980ab413687953204f6058c4bc2
rename to explorer/fuzzing/fuzzer_corpus/95a9c60ab5e4c36a851c95daf9f4ab05d231616e
index 0343efebc984..3d54aa353114 100644
--- a/explorer/fuzzing/fuzzer_corpus/88162709275c9980ab413687953204f6058c4bc2
+++ b/explorer/fuzzing/fuzzer_corpus/95a9c60ab5e4c36a851c95daf9f4ab05d231616e
@@ -69,9 +69,9 @@ compilation_unit {
       members {
         function {
           name: "Get"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -101,7 +101,7 @@ compilation_unit {
                     field: "data"
                     object {
                       identifier {
-                        name: "me"
+                        name: "self"
                       }
                     }
                   }
@@ -114,10 +114,10 @@ compilation_unit {
       members {
         function {
           name: "Put"
-          me_pattern {
+          self_pattern {
             addr_pattern {
               binding_pattern {
-                name: "me"
+                name: "self"
                 type {
                   expression_pattern {
                     expression {
@@ -165,7 +165,7 @@ compilation_unit {
                         op: Deref
                         arguments {
                           identifier {
-                            name: "me"
+                            name: "self"
                           }
                         }
                       }
@@ -206,10 +206,10 @@ compilation_unit {
               }
             }
           }
-          me_pattern {
+          self_pattern {
             addr_pattern {
               binding_pattern {
-                name: "me"
+                name: "self"
                 type {
                   expression_pattern {
                     expression {
@@ -257,7 +257,7 @@ compilation_unit {
                         op: Deref
                         arguments {
                           identifier {
-                            name: "me"
+                            name: "self"
                           }
                         }
                       }
@@ -284,9 +284,9 @@ compilation_unit {
               }
             }
           }
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
diff --git a/explorer/fuzzing/fuzzer_corpus/0136dad99e8d30078c7bc3d04e0f5092cb11bba6 b/explorer/fuzzing/fuzzer_corpus/96f08313767988395fc4ff5ee5004de1f859bcf3
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/0136dad99e8d30078c7bc3d04e0f5092cb11bba6
rename to explorer/fuzzing/fuzzer_corpus/96f08313767988395fc4ff5ee5004de1f859bcf3
index 10d49e1d9ad2..dd2c074e253e 100644
--- a/explorer/fuzzing/fuzzer_corpus/0136dad99e8d30078c7bc3d04e0f5092cb11bba6
+++ b/explorer/fuzzing/fuzzer_corpus/96f08313767988395fc4ff5ee5004de1f859bcf3
@@ -9,9 +9,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -52,9 +52,9 @@ compilation_unit {
       members {
         function {
           name: "Scale"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -151,9 +151,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -204,7 +204,7 @@ compilation_unit {
                               field: "x"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
@@ -232,7 +232,7 @@ compilation_unit {
                               field: "y"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
@@ -260,9 +260,9 @@ compilation_unit {
       members {
         function {
           name: "Scale"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -312,7 +312,7 @@ compilation_unit {
                               field: "x"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
@@ -335,7 +335,7 @@ compilation_unit {
                               field: "y"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
diff --git a/explorer/fuzzing/fuzzer_corpus/4b393503fcb60d124fc7f9e348c0fd876703c97f b/explorer/fuzzing/fuzzer_corpus/96fba84df7af5f15b9b893854390d1c5948f69b6
similarity index 99%
rename from explorer/fuzzing/fuzzer_corpus/4b393503fcb60d124fc7f9e348c0fd876703c97f
rename to explorer/fuzzing/fuzzer_corpus/96fba84df7af5f15b9b893854390d1c5948f69b6
index 7021b33963fe..d5fc92aa3554 100644
--- a/explorer/fuzzing/fuzzer_corpus/4b393503fcb60d124fc7f9e348c0fd876703c97f
+++ b/explorer/fuzzing/fuzzer_corpus/96fba84df7af5f15b9b893854390d1c5948f69b6
@@ -48,9 +48,9 @@ compilation_unit {
       members {
         function {
           name: "Make"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
diff --git a/explorer/fuzzing/fuzzer_corpus/c80f0cdec56c9c80a75af74577046f6f42ea264e b/explorer/fuzzing/fuzzer_corpus/9a4ba2e3d195dc6c6227fe1601d3e060a6e7f6aa
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/c80f0cdec56c9c80a75af74577046f6f42ea264e
rename to explorer/fuzzing/fuzzer_corpus/9a4ba2e3d195dc6c6227fe1601d3e060a6e7f6aa
index 8e8504cc9da0..2a75e3609185 100644
--- a/explorer/fuzzing/fuzzer_corpus/c80f0cdec56c9c80a75af74577046f6f42ea264e
+++ b/explorer/fuzzing/fuzzer_corpus/9a4ba2e3d195dc6c6227fe1601d3e060a6e7f6aa
@@ -51,9 +51,9 @@ compilation_unit {
       members {
         function {
           name: "Convert"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -82,7 +82,7 @@ compilation_unit {
                     field: "n"
                     object {
                       identifier {
-                        name: "me"
+                        name: "self"
                       }
                     }
                   }
diff --git a/explorer/fuzzing/fuzzer_corpus/d0855246f8a9ed518dd7c303b8613029a7219d11 b/explorer/fuzzing/fuzzer_corpus/9a788bace10906aa7b48858da3e4da9a0f25e82a
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/d0855246f8a9ed518dd7c303b8613029a7219d11
rename to explorer/fuzzing/fuzzer_corpus/9a788bace10906aa7b48858da3e4da9a0f25e82a
index 4d1731a126ac..3aa2b2e3dcca 100644
--- a/explorer/fuzzing/fuzzer_corpus/d0855246f8a9ed518dd7c303b8613029a7219d11
+++ b/explorer/fuzzing/fuzzer_corpus/9a788bace10906aa7b48858da3e4da9a0f25e82a
@@ -69,9 +69,9 @@ compilation_unit {
       members {
         function {
           name: "Op"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -121,7 +121,7 @@ compilation_unit {
                               field: "n"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
diff --git a/explorer/fuzzing/fuzzer_corpus/acd454a580934f272d848c8130dd11eb2acebb7e b/explorer/fuzzing/fuzzer_corpus/9cba43f25b464b5858b7c390a2579220e467624a
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/acd454a580934f272d848c8130dd11eb2acebb7e
rename to explorer/fuzzing/fuzzer_corpus/9cba43f25b464b5858b7c390a2579220e467624a
index 477ec94ed058..c7d9be597ca6 100644
--- a/explorer/fuzzing/fuzzer_corpus/acd454a580934f272d848c8130dd11eb2acebb7e
+++ b/explorer/fuzzing/fuzzer_corpus/9cba43f25b464b5858b7c390a2579220e467624a
@@ -64,9 +64,9 @@ compilation_unit {
           members {
             function {
               name: "Convert"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -101,7 +101,7 @@ compilation_unit {
                                 field: "v1"
                                 object {
                                   identifier {
-                                    name: "me"
+                                    name: "self"
                                   }
                                 }
                               }
@@ -111,7 +111,7 @@ compilation_unit {
                                 field: "v2"
                                 object {
                                   identifier {
-                                    name: "me"
+                                    name: "self"
                                   }
                                 }
                               }
diff --git a/explorer/fuzzing/fuzzer_corpus/a486a13761ef2a4f2aee0c606a8f0f8909455f5b b/explorer/fuzzing/fuzzer_corpus/9d75ba5391f79aac733cc4129010928b3684c9c9
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/a486a13761ef2a4f2aee0c606a8f0f8909455f5b
rename to explorer/fuzzing/fuzzer_corpus/9d75ba5391f79aac733cc4129010928b3684c9c9
index b8690a7545b8..b9120e30a888 100644
--- a/explorer/fuzzing/fuzzer_corpus/a486a13761ef2a4f2aee0c606a8f0f8909455f5b
+++ b/explorer/fuzzing/fuzzer_corpus/9d75ba5391f79aac733cc4129010928b3684c9c9
@@ -22,9 +22,9 @@ compilation_unit {
       members {
         function {
           name: "F"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -192,9 +192,9 @@ compilation_unit {
       members {
         function {
           name: "F"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -223,7 +223,7 @@ compilation_unit {
                     op: Add
                     arguments {
                       identifier {
-                        name: "me"
+                        name: "self"
                       }
                     }
                     arguments {
diff --git a/explorer/fuzzing/fuzzer_corpus/8f567ed115d73c525dd84102f7dc83b761f43717 b/explorer/fuzzing/fuzzer_corpus/9f30c25aa9b6303e94e12c457c2e126c95bbbf91
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/8f567ed115d73c525dd84102f7dc83b761f43717
rename to explorer/fuzzing/fuzzer_corpus/9f30c25aa9b6303e94e12c457c2e126c95bbbf91
index d4704813adfa..10a445d1d5be 100644
--- a/explorer/fuzzing/fuzzer_corpus/8f567ed115d73c525dd84102f7dc83b761f43717
+++ b/explorer/fuzzing/fuzzer_corpus/9f30c25aa9b6303e94e12c457c2e126c95bbbf91
@@ -9,9 +9,9 @@ compilation_unit {
       members {
         function {
           name: "F"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -122,9 +122,9 @@ compilation_unit {
           members {
             function {
               name: "F"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -161,7 +161,7 @@ compilation_unit {
                             field: "n"
                             object {
                               identifier {
-                                name: "me"
+                                name: "self"
                               }
                             }
                           }
diff --git a/explorer/fuzzing/fuzzer_corpus/a29d5fdb3bd77cbf61e5f07718cb825da28ad192 b/explorer/fuzzing/fuzzer_corpus/a241138ba16f277e89d9e6e345073179328b043c
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/a29d5fdb3bd77cbf61e5f07718cb825da28ad192
rename to explorer/fuzzing/fuzzer_corpus/a241138ba16f277e89d9e6e345073179328b043c
index 7924f0d919d0..74dea97c0851 100644
--- a/explorer/fuzzing/fuzzer_corpus/a29d5fdb3bd77cbf61e5f07718cb825da28ad192
+++ b/explorer/fuzzing/fuzzer_corpus/a241138ba16f277e89d9e6e345073179328b043c
@@ -24,9 +24,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -67,9 +67,9 @@ compilation_unit {
       members {
         function {
           name: "Scale"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -218,9 +218,9 @@ compilation_unit {
           members {
             function {
               name: "Add"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -271,7 +271,7 @@ compilation_unit {
                                   field: "x"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -299,7 +299,7 @@ compilation_unit {
                                   field: "y"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -327,9 +327,9 @@ compilation_unit {
           members {
             function {
               name: "Scale"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -379,7 +379,7 @@ compilation_unit {
                                   field: "x"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -402,7 +402,7 @@ compilation_unit {
                                   field: "y"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
diff --git a/explorer/fuzzing/fuzzer_corpus/a00b940d7948547679a79e9adb531b95d63b935e b/explorer/fuzzing/fuzzer_corpus/a259463d1805998765e3da5a692fdce91fdfe003
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/a00b940d7948547679a79e9adb531b95d63b935e
rename to explorer/fuzzing/fuzzer_corpus/a259463d1805998765e3da5a692fdce91fdfe003
index 68f3ff0fe28c..be7b6dcea59e 100644
--- a/explorer/fuzzing/fuzzer_corpus/a00b940d7948547679a79e9adb531b95d63b935e
+++ b/explorer/fuzzing/fuzzer_corpus/a259463d1805998765e3da5a692fdce91fdfe003
@@ -24,9 +24,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -67,9 +67,9 @@ compilation_unit {
       members {
         function {
           name: "Scale"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -232,9 +232,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -285,7 +285,7 @@ compilation_unit {
                               field: "x"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
@@ -313,7 +313,7 @@ compilation_unit {
                               field: "y"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
@@ -341,9 +341,9 @@ compilation_unit {
       members {
         function {
           name: "Scale"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -393,7 +393,7 @@ compilation_unit {
                               field: "x"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
@@ -416,7 +416,7 @@ compilation_unit {
                               field: "y"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
diff --git a/explorer/fuzzing/fuzzer_corpus/4a091f159e80a39b3356cf1328c1b4481da0c2a8 b/explorer/fuzzing/fuzzer_corpus/a758174457d5b22eb2a94c9cc72e4341dfa97ff0
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/4a091f159e80a39b3356cf1328c1b4481da0c2a8
rename to explorer/fuzzing/fuzzer_corpus/a758174457d5b22eb2a94c9cc72e4341dfa97ff0
index 6556ed5a1384..07f55416aafa 100644
--- a/explorer/fuzzing/fuzzer_corpus/4a091f159e80a39b3356cf1328c1b4481da0c2a8
+++ b/explorer/fuzzing/fuzzer_corpus/a758174457d5b22eb2a94c9cc72e4341dfa97ff0
@@ -24,9 +24,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -67,9 +67,9 @@ compilation_unit {
       members {
         function {
           name: "Scale"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -244,9 +244,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -333,7 +333,7 @@ compilation_unit {
                               field: "x"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
@@ -361,7 +361,7 @@ compilation_unit {
                               field: "y"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
@@ -389,9 +389,9 @@ compilation_unit {
       members {
         function {
           name: "Scale"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -465,7 +465,7 @@ compilation_unit {
                               field: "x"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
@@ -488,7 +488,7 @@ compilation_unit {
                               field: "y"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
diff --git a/explorer/fuzzing/fuzzer_corpus/e966e46ab441ed7b8d38414abeafd8e8f191d572 b/explorer/fuzzing/fuzzer_corpus/a7d494461ef98c3ec480cfbe332b94c53123a2ca
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/e966e46ab441ed7b8d38414abeafd8e8f191d572
rename to explorer/fuzzing/fuzzer_corpus/a7d494461ef98c3ec480cfbe332b94c53123a2ca
index b2d29d630996..5cf298720f5a 100644
--- a/explorer/fuzzing/fuzzer_corpus/e966e46ab441ed7b8d38414abeafd8e8f191d572
+++ b/explorer/fuzzing/fuzzer_corpus/a7d494461ef98c3ec480cfbe332b94c53123a2ca
@@ -69,9 +69,9 @@ compilation_unit {
       members {
         function {
           name: "Op"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -121,7 +121,7 @@ compilation_unit {
                               field: "n"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
diff --git a/explorer/fuzzing/fuzzer_corpus/4227c83c1c22d8b5959a50c36e7f48bef8f80c57 b/explorer/fuzzing/fuzzer_corpus/aaa6ab93c6b3c8e212cd59f1d9fea90258723519
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/4227c83c1c22d8b5959a50c36e7f48bef8f80c57
rename to explorer/fuzzing/fuzzer_corpus/aaa6ab93c6b3c8e212cd59f1d9fea90258723519
index d41fd8a8ac65..8153cd25f972 100644
--- a/explorer/fuzzing/fuzzer_corpus/4227c83c1c22d8b5959a50c36e7f48bef8f80c57
+++ b/explorer/fuzzing/fuzzer_corpus/aaa6ab93c6b3c8e212cd59f1d9fea90258723519
@@ -64,9 +64,9 @@ compilation_unit {
       members {
         function {
           name: "GetX"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -96,7 +96,7 @@ compilation_unit {
                     field: "x"
                     object {
                       identifier {
-                        name: "me"
+                        name: "self"
                       }
                     }
                   }
diff --git a/explorer/fuzzing/fuzzer_corpus/393e58a1743cf2f0b3d90112ce1591e420209994 b/explorer/fuzzing/fuzzer_corpus/af25c1403b2f590b2f02aca103b3d3aaf754c21f
similarity index 96%
rename from explorer/fuzzing/fuzzer_corpus/393e58a1743cf2f0b3d90112ce1591e420209994
rename to explorer/fuzzing/fuzzer_corpus/af25c1403b2f590b2f02aca103b3d3aaf754c21f
index 00fd5475dfb8..7c57d6dbccc1 100644
--- a/explorer/fuzzing/fuzzer_corpus/393e58a1743cf2f0b3d90112ce1591e420209994
+++ b/explorer/fuzzing/fuzzer_corpus/af25c1403b2f590b2f02aca103b3d3aaf754c21f
@@ -9,9 +9,9 @@ compilation_unit {
       members {
         function {
           name: "F"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -58,7 +58,7 @@ compilation_unit {
                             field: "H"
                             object {
                               identifier {
-                                name: "me"
+                                name: "self"
                               }
                             }
                           }
@@ -104,9 +104,9 @@ compilation_unit {
       members {
         function {
           name: "H"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
diff --git a/explorer/fuzzing/fuzzer_corpus/0a171cb7acaed31daaaa6f8671f3664368ce831d b/explorer/fuzzing/fuzzer_corpus/b6373f76cc92fb1fe208dc91648cf91401135f24
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/0a171cb7acaed31daaaa6f8671f3664368ce831d
rename to explorer/fuzzing/fuzzer_corpus/b6373f76cc92fb1fe208dc91648cf91401135f24
index 1542c77cd6a2..cbbe35b01a12 100644
--- a/explorer/fuzzing/fuzzer_corpus/0a171cb7acaed31daaaa6f8671f3664368ce831d
+++ b/explorer/fuzzing/fuzzer_corpus/b6373f76cc92fb1fe208dc91648cf91401135f24
@@ -9,9 +9,9 @@ compilation_unit {
       members {
         function {
           name: "F"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -77,9 +77,9 @@ compilation_unit {
           members {
             function {
               name: "F"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -130,7 +130,7 @@ compilation_unit {
                                   field: "n"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
diff --git a/explorer/fuzzing/fuzzer_corpus/697a7ee475236d847755ce89e8f690e4e015d153 b/explorer/fuzzing/fuzzer_corpus/be78316bb9ec1686ddfa3c5643d8f5b9d898ad7d
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/697a7ee475236d847755ce89e8f690e4e015d153
rename to explorer/fuzzing/fuzzer_corpus/be78316bb9ec1686ddfa3c5643d8f5b9d898ad7d
index ffe9049d4b9c..0917098cff34 100644
--- a/explorer/fuzzing/fuzzer_corpus/697a7ee475236d847755ce89e8f690e4e015d153
+++ b/explorer/fuzzing/fuzzer_corpus/be78316bb9ec1686ddfa3c5643d8f5b9d898ad7d
@@ -64,9 +64,9 @@ compilation_unit {
           members {
             function {
               name: "Convert"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -98,7 +98,7 @@ compilation_unit {
                             field: "v1"
                             object {
                               identifier {
-                                name: "me"
+                                name: "self"
                               }
                             }
                           }
@@ -108,7 +108,7 @@ compilation_unit {
                             field: "v2"
                             object {
                               identifier {
-                                name: "me"
+                                name: "self"
                               }
                             }
                           }
diff --git a/explorer/fuzzing/fuzzer_corpus/4dcc61c04749ea65b656ec38bbb35f67726cc641 b/explorer/fuzzing/fuzzer_corpus/bfef4e635dfb263c727586a8beb90b3e1e7d45bc
similarity index 96%
rename from explorer/fuzzing/fuzzer_corpus/4dcc61c04749ea65b656ec38bbb35f67726cc641
rename to explorer/fuzzing/fuzzer_corpus/bfef4e635dfb263c727586a8beb90b3e1e7d45bc
index 77992e02cac8..f7eb3d0e23c5 100644
--- a/explorer/fuzzing/fuzzer_corpus/4dcc61c04749ea65b656ec38bbb35f67726cc641
+++ b/explorer/fuzzing/fuzzer_corpus/bfef4e635dfb263c727586a8beb90b3e1e7d45bc
@@ -50,9 +50,9 @@ compilation_unit {
       members {
         function {
           name: "GetX"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -81,7 +81,7 @@ compilation_unit {
                     field: "x"
                     object {
                       identifier {
-                        name: "me"
+                        name: "self"
                       }
                     }
                   }
@@ -94,9 +94,9 @@ compilation_unit {
       members {
         function {
           name: "GetXY"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -137,7 +137,7 @@ compilation_unit {
                             field: "GetX"
                             object {
                               identifier {
-                                name: "me"
+                                name: "self"
                               }
                             }
                           }
@@ -153,7 +153,7 @@ compilation_unit {
                         field: "y"
                         object {
                           identifier {
-                            name: "me"
+                            name: "self"
                           }
                         }
                       }
diff --git a/explorer/fuzzing/fuzzer_corpus/9f8104c454c3520bd68025e71d4d3fd148a96c0a b/explorer/fuzzing/fuzzer_corpus/c4f7cc23c6d83486f2901f99e48c65d815b3b919
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/9f8104c454c3520bd68025e71d4d3fd148a96c0a
rename to explorer/fuzzing/fuzzer_corpus/c4f7cc23c6d83486f2901f99e48c65d815b3b919
index d776fcd93e1b..7bcc95b14f9d 100644
--- a/explorer/fuzzing/fuzzer_corpus/9f8104c454c3520bd68025e71d4d3fd148a96c0a
+++ b/explorer/fuzzing/fuzzer_corpus/c4f7cc23c6d83486f2901f99e48c65d815b3b919
@@ -77,9 +77,9 @@ compilation_unit {
       members {
         function {
           name: "GetX"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -122,7 +122,7 @@ compilation_unit {
                     field: "x"
                     object {
                       identifier {
-                        name: "me"
+                        name: "self"
                       }
                     }
                   }
diff --git a/explorer/fuzzing/fuzzer_corpus/c4857afa26c2cd7eca7654b0d283170094e9d601 b/explorer/fuzzing/fuzzer_corpus/c7287f3ba5df5bacd5a9f2d922af57f635dfe245
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/c4857afa26c2cd7eca7654b0d283170094e9d601
rename to explorer/fuzzing/fuzzer_corpus/c7287f3ba5df5bacd5a9f2d922af57f635dfe245
index acdbfa1ecd71..12a2437b996f 100644
--- a/explorer/fuzzing/fuzzer_corpus/c4857afa26c2cd7eca7654b0d283170094e9d601
+++ b/explorer/fuzzing/fuzzer_corpus/c7287f3ba5df5bacd5a9f2d922af57f635dfe245
@@ -64,9 +64,9 @@ compilation_unit {
           members {
             function {
               name: "Convert"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -98,7 +98,7 @@ compilation_unit {
                             field: "v1"
                             object {
                               identifier {
-                                name: "me"
+                                name: "self"
                               }
                             }
                           }
@@ -108,7 +108,7 @@ compilation_unit {
                             field: "v2"
                             object {
                               identifier {
-                                name: "me"
+                                name: "self"
                               }
                             }
                           }
diff --git a/explorer/fuzzing/fuzzer_corpus/5de25e63d76841ad22c466e5bc864e4bc78e1906 b/explorer/fuzzing/fuzzer_corpus/c9eaac22587d9772d74df77cdb8c648e0fc49363
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/5de25e63d76841ad22c466e5bc864e4bc78e1906
rename to explorer/fuzzing/fuzzer_corpus/c9eaac22587d9772d74df77cdb8c648e0fc49363
index a34f3184617d..3a7dbd68b95f 100644
--- a/explorer/fuzzing/fuzzer_corpus/5de25e63d76841ad22c466e5bc864e4bc78e1906
+++ b/explorer/fuzzing/fuzzer_corpus/c9eaac22587d9772d74df77cdb8c648e0fc49363
@@ -24,9 +24,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -159,9 +159,9 @@ compilation_unit {
       members {
         function {
           name: "Clone"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -221,7 +221,7 @@ compilation_unit {
                           field: "x"
                           object {
                             identifier {
-                              name: "me"
+                              name: "self"
                             }
                           }
                         }
@@ -234,7 +234,7 @@ compilation_unit {
                           field: "y"
                           object {
                             identifier {
-                              name: "me"
+                              name: "self"
                             }
                           }
                         }
@@ -250,9 +250,9 @@ compilation_unit {
       members {
         function {
           name: "SumXY"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -300,7 +300,7 @@ compilation_unit {
                             field: "x"
                             object {
                               identifier {
-                                name: "me"
+                                name: "self"
                               }
                             }
                           }
@@ -314,7 +314,7 @@ compilation_unit {
                             field: "y"
                             object {
                               identifier {
-                                name: "me"
+                                name: "self"
                               }
                             }
                           }
@@ -414,9 +414,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -457,7 +457,7 @@ compilation_unit {
                     op: Add
                     arguments {
                       identifier {
-                        name: "me"
+                        name: "self"
                       }
                     }
                     arguments {
diff --git a/explorer/fuzzing/fuzzer_corpus/613687dda67430398f904337310b9409fd419820 b/explorer/fuzzing/fuzzer_corpus/cdb8d73edbd3b87a9102787bd474da119619744e
similarity index 99%
rename from explorer/fuzzing/fuzzer_corpus/613687dda67430398f904337310b9409fd419820
rename to explorer/fuzzing/fuzzer_corpus/cdb8d73edbd3b87a9102787bd474da119619744e
index ce11da388a6d..962f2233fdaf 100644
--- a/explorer/fuzzing/fuzzer_corpus/613687dda67430398f904337310b9409fd419820
+++ b/explorer/fuzzing/fuzzer_corpus/cdb8d73edbd3b87a9102787bd474da119619744e
@@ -72,9 +72,9 @@ compilation_unit {
       members {
         function {
           name: "G"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -134,9 +134,9 @@ compilation_unit {
       members {
         function {
           name: "G"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -164,7 +164,7 @@ compilation_unit {
                     op: Add
                     arguments {
                       identifier {
-                        name: "me"
+                        name: "self"
                       }
                     }
                     arguments {
diff --git a/explorer/fuzzing/fuzzer_corpus/edab3242f14ca0005a3075431f0de1ce54b98e9a b/explorer/fuzzing/fuzzer_corpus/d0072654ed20717ed64b026b1df31cabc7a84867
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/edab3242f14ca0005a3075431f0de1ce54b98e9a
rename to explorer/fuzzing/fuzzer_corpus/d0072654ed20717ed64b026b1df31cabc7a84867
index 076f1963532b..0c7178cae286 100644
--- a/explorer/fuzzing/fuzzer_corpus/edab3242f14ca0005a3075431f0de1ce54b98e9a
+++ b/explorer/fuzzing/fuzzer_corpus/d0072654ed20717ed64b026b1df31cabc7a84867
@@ -21,9 +21,9 @@ compilation_unit {
       members {
         function {
           name: "G"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
diff --git a/explorer/fuzzing/fuzzer_corpus/9b65410831edbfda19cdf558c2e658e514ffd318 b/explorer/fuzzing/fuzzer_corpus/d17cefb7b011dede9bbfdb0aa80ac6b15673421d
similarity index 99%
rename from explorer/fuzzing/fuzzer_corpus/9b65410831edbfda19cdf558c2e658e514ffd318
rename to explorer/fuzzing/fuzzer_corpus/d17cefb7b011dede9bbfdb0aa80ac6b15673421d
index 368efb6a2348..f9c8c3774714 100644
--- a/explorer/fuzzing/fuzzer_corpus/9b65410831edbfda19cdf558c2e658e514ffd318
+++ b/explorer/fuzzing/fuzzer_corpus/d17cefb7b011dede9bbfdb0aa80ac6b15673421d
@@ -9,9 +9,9 @@ compilation_unit {
       members {
         function {
           name: "F"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -104,9 +104,9 @@ compilation_unit {
           members {
             function {
               name: "F"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -179,7 +179,7 @@ compilation_unit {
                                   field: "n"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
diff --git a/explorer/fuzzing/fuzzer_corpus/31e244f3fdbe46f75fb7fa775ee282e960b57c0c b/explorer/fuzzing/fuzzer_corpus/d3107f901f2b6cfae8bfcbe1c1bea5a9342a7bfe
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/31e244f3fdbe46f75fb7fa775ee282e960b57c0c
rename to explorer/fuzzing/fuzzer_corpus/d3107f901f2b6cfae8bfcbe1c1bea5a9342a7bfe
index 1830221ed386..55e459f3373c 100644
--- a/explorer/fuzzing/fuzzer_corpus/31e244f3fdbe46f75fb7fa775ee282e960b57c0c
+++ b/explorer/fuzzing/fuzzer_corpus/d3107f901f2b6cfae8bfcbe1c1bea5a9342a7bfe
@@ -24,9 +24,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -162,9 +162,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -205,7 +205,7 @@ compilation_unit {
                     op: Add
                     arguments {
                       identifier {
-                        name: "me"
+                        name: "self"
                       }
                     }
                     arguments {
@@ -331,9 +331,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -425,7 +425,7 @@ compilation_unit {
                                   field: "x"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -461,7 +461,7 @@ compilation_unit {
                                   field: "y"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
diff --git a/explorer/fuzzing/fuzzer_corpus/05acd8c5486c8c3c14cc3cd35202080730090b5c b/explorer/fuzzing/fuzzer_corpus/d40edaf63b231abdad442910a80fe73b4b138e45
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/05acd8c5486c8c3c14cc3cd35202080730090b5c
rename to explorer/fuzzing/fuzzer_corpus/d40edaf63b231abdad442910a80fe73b4b138e45
index 435c151d2e61..2027d4393563 100644
--- a/explorer/fuzzing/fuzzer_corpus/05acd8c5486c8c3c14cc3cd35202080730090b5c
+++ b/explorer/fuzzing/fuzzer_corpus/d40edaf63b231abdad442910a80fe73b4b138e45
@@ -9,9 +9,9 @@ compilation_unit {
       members {
         function {
           name: "Convert"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -58,9 +58,9 @@ compilation_unit {
       members {
         function {
           name: "Convert"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -85,7 +85,7 @@ compilation_unit {
               return_expression_statement {
                 expression {
                   identifier {
-                    name: "me"
+                    name: "self"
                   }
                 }
               }
diff --git a/explorer/fuzzing/fuzzer_corpus/a71e9f13b75a628eefa0bdc7dd63992e9001bddf b/explorer/fuzzing/fuzzer_corpus/db51b71d05c77ffb5fae42a2b67894958b008cf9
similarity index 99%
rename from explorer/fuzzing/fuzzer_corpus/a71e9f13b75a628eefa0bdc7dd63992e9001bddf
rename to explorer/fuzzing/fuzzer_corpus/db51b71d05c77ffb5fae42a2b67894958b008cf9
index ff44a9aab3ec..f269dd8ba0b0 100644
--- a/explorer/fuzzing/fuzzer_corpus/a71e9f13b75a628eefa0bdc7dd63992e9001bddf
+++ b/explorer/fuzzing/fuzzer_corpus/db51b71d05c77ffb5fae42a2b67894958b008cf9
@@ -23,9 +23,9 @@ compilation_unit {
       members {
         function {
           name: "M"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -116,9 +116,9 @@ compilation_unit {
           members {
             function {
               name: "M"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -157,9 +157,9 @@ compilation_unit {
       members {
         function {
           name: "G"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -235,9 +235,9 @@ compilation_unit {
       members {
         function {
           name: "M"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
diff --git a/explorer/fuzzing/fuzzer_corpus/e5f08dfb1fde1bb2240c55d4786a28ad5b69dc5d b/explorer/fuzzing/fuzzer_corpus/dcd78edaee92cc54a860e0c5987289c094115dce
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/e5f08dfb1fde1bb2240c55d4786a28ad5b69dc5d
rename to explorer/fuzzing/fuzzer_corpus/dcd78edaee92cc54a860e0c5987289c094115dce
index c6aceb60dee2..5ea9a4a2ad11 100644
--- a/explorer/fuzzing/fuzzer_corpus/e5f08dfb1fde1bb2240c55d4786a28ad5b69dc5d
+++ b/explorer/fuzzing/fuzzer_corpus/dcd78edaee92cc54a860e0c5987289c094115dce
@@ -9,9 +9,9 @@ compilation_unit {
       members {
         function {
           name: "F"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -77,9 +77,9 @@ compilation_unit {
           members {
             function {
               name: "F"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -130,7 +130,7 @@ compilation_unit {
                                   field: "n"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
diff --git a/explorer/fuzzing/fuzzer_corpus/dccf7250f94a4cbeb6473dd595cfc49b53c3ddb9 b/explorer/fuzzing/fuzzer_corpus/e11373b9810392a281ac5392bb3e8b287ae48b8f
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/dccf7250f94a4cbeb6473dd595cfc49b53c3ddb9
rename to explorer/fuzzing/fuzzer_corpus/e11373b9810392a281ac5392bb3e8b287ae48b8f
index 933a63c2790a..a05e1fcc1958 100644
--- a/explorer/fuzzing/fuzzer_corpus/dccf7250f94a4cbeb6473dd595cfc49b53c3ddb9
+++ b/explorer/fuzzing/fuzzer_corpus/e11373b9810392a281ac5392bb3e8b287ae48b8f
@@ -9,9 +9,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -52,9 +52,9 @@ compilation_unit {
       members {
         function {
           name: "Scale"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
diff --git a/explorer/fuzzing/fuzzer_corpus/ba5a17f21f5a3d2afcf5ceeebed655d8223dbf30 b/explorer/fuzzing/fuzzer_corpus/e3a2048ccc04d8ca8a047947a88dbfc45c48c9ba
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/ba5a17f21f5a3d2afcf5ceeebed655d8223dbf30
rename to explorer/fuzzing/fuzzer_corpus/e3a2048ccc04d8ca8a047947a88dbfc45c48c9ba
index f9c706ac498b..259c04a97541 100644
--- a/explorer/fuzzing/fuzzer_corpus/ba5a17f21f5a3d2afcf5ceeebed655d8223dbf30
+++ b/explorer/fuzzing/fuzzer_corpus/e3a2048ccc04d8ca8a047947a88dbfc45c48c9ba
@@ -24,9 +24,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -67,9 +67,9 @@ compilation_unit {
       members {
         function {
           name: "Scale"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -205,9 +205,9 @@ compilation_unit {
           members {
             function {
               name: "Add"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -258,7 +258,7 @@ compilation_unit {
                                   field: "x"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -286,7 +286,7 @@ compilation_unit {
                                   field: "y"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -314,9 +314,9 @@ compilation_unit {
           members {
             function {
               name: "Scale"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -366,7 +366,7 @@ compilation_unit {
                                   field: "x"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -389,7 +389,7 @@ compilation_unit {
                                   field: "y"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
diff --git a/explorer/fuzzing/fuzzer_corpus/0dd8c45c372707496adb50645eb89a2878a20e5a b/explorer/fuzzing/fuzzer_corpus/e43d3ef85d9d38a38672ec93544d045b1c94141a
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/0dd8c45c372707496adb50645eb89a2878a20e5a
rename to explorer/fuzzing/fuzzer_corpus/e43d3ef85d9d38a38672ec93544d045b1c94141a
index 1a961017d695..bca0f11072c0 100644
--- a/explorer/fuzzing/fuzzer_corpus/0dd8c45c372707496adb50645eb89a2878a20e5a
+++ b/explorer/fuzzing/fuzzer_corpus/e43d3ef85d9d38a38672ec93544d045b1c94141a
@@ -50,9 +50,9 @@ compilation_unit {
       members {
         function {
           name: "SetX"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
diff --git a/explorer/fuzzing/fuzzer_corpus/9e784944a6621142ca78cafc0c5ac683acd166a6 b/explorer/fuzzing/fuzzer_corpus/e5931743b8a74dbbce5c55fa701312edb4c40a12
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/9e784944a6621142ca78cafc0c5ac683acd166a6
rename to explorer/fuzzing/fuzzer_corpus/e5931743b8a74dbbce5c55fa701312edb4c40a12
index 5bc4521c21d7..0266c4bab544 100644
--- a/explorer/fuzzing/fuzzer_corpus/9e784944a6621142ca78cafc0c5ac683acd166a6
+++ b/explorer/fuzzing/fuzzer_corpus/e5931743b8a74dbbce5c55fa701312edb4c40a12
@@ -9,9 +9,9 @@ compilation_unit {
       members {
         function {
           name: "F"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
diff --git a/explorer/fuzzing/fuzzer_corpus/fb6eda8ca419ae74f058ab7e5ce20944bd01ca14 b/explorer/fuzzing/fuzzer_corpus/ea8c77a027e0cda36aebfc1a176ae95a1cb00186
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/fb6eda8ca419ae74f058ab7e5ce20944bd01ca14
rename to explorer/fuzzing/fuzzer_corpus/ea8c77a027e0cda36aebfc1a176ae95a1cb00186
index 3bcbf443b87c..32ac19bb667d 100644
--- a/explorer/fuzzing/fuzzer_corpus/fb6eda8ca419ae74f058ab7e5ce20944bd01ca14
+++ b/explorer/fuzzing/fuzzer_corpus/ea8c77a027e0cda36aebfc1a176ae95a1cb00186
@@ -9,9 +9,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -72,9 +72,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -117,7 +117,7 @@ compilation_unit {
                     op: Add
                     arguments {
                       identifier {
-                        name: "me"
+                        name: "self"
                       }
                     }
                     arguments {
@@ -176,9 +176,9 @@ compilation_unit {
       members {
         function {
           name: "Get"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -226,7 +226,7 @@ compilation_unit {
                             field: "m"
                             object {
                               identifier {
-                                name: "me"
+                                name: "self"
                               }
                             }
                           }
diff --git a/explorer/fuzzing/fuzzer_corpus/3044f51dca656bab9012816c75a4399873af5dbd b/explorer/fuzzing/fuzzer_corpus/ecea59a9cb6f58e0b9019352a683f3a364f63cd8
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/3044f51dca656bab9012816c75a4399873af5dbd
rename to explorer/fuzzing/fuzzer_corpus/ecea59a9cb6f58e0b9019352a683f3a364f63cd8
index 1f1c5c5ef325..64845e63f635 100644
--- a/explorer/fuzzing/fuzzer_corpus/3044f51dca656bab9012816c75a4399873af5dbd
+++ b/explorer/fuzzing/fuzzer_corpus/ecea59a9cb6f58e0b9019352a683f3a364f63cd8
@@ -9,9 +9,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -52,9 +52,9 @@ compilation_unit {
       members {
         function {
           name: "Mul"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -116,9 +116,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -159,7 +159,7 @@ compilation_unit {
                     op: Add
                     arguments {
                       identifier {
-                        name: "me"
+                        name: "self"
                       }
                     }
                     arguments {
@@ -177,9 +177,9 @@ compilation_unit {
       members {
         function {
           name: "Mul"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -220,7 +220,7 @@ compilation_unit {
                     op: Mul
                     arguments {
                       identifier {
-                        name: "me"
+                        name: "self"
                       }
                     }
                     arguments {
@@ -291,9 +291,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -334,9 +334,9 @@ compilation_unit {
       members {
         function {
           name: "Scale"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -377,9 +377,9 @@ compilation_unit {
       members {
         function {
           name: "Hold"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -541,9 +541,9 @@ compilation_unit {
           members {
             function {
               name: "Add"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -594,7 +594,7 @@ compilation_unit {
                                   field: "x"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -622,7 +622,7 @@ compilation_unit {
                                   field: "y"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -650,9 +650,9 @@ compilation_unit {
           members {
             function {
               name: "Scale"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -702,7 +702,7 @@ compilation_unit {
                                   field: "x"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -725,7 +725,7 @@ compilation_unit {
                                   field: "y"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -748,9 +748,9 @@ compilation_unit {
           members {
             function {
               name: "Hold"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
diff --git a/explorer/fuzzing/fuzzer_corpus/7554b386f168adef412b196c40c4979363fff395 b/explorer/fuzzing/fuzzer_corpus/ee4e747627dba6ffbd9fcb1a18a940fe04a784fb
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/7554b386f168adef412b196c40c4979363fff395
rename to explorer/fuzzing/fuzzer_corpus/ee4e747627dba6ffbd9fcb1a18a940fe04a784fb
index 69afe14b2786..a1f98330696b 100644
--- a/explorer/fuzzing/fuzzer_corpus/7554b386f168adef412b196c40c4979363fff395
+++ b/explorer/fuzzing/fuzzer_corpus/ee4e747627dba6ffbd9fcb1a18a940fe04a784fb
@@ -9,9 +9,9 @@ compilation_unit {
       members {
         function {
           name: "Op"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -122,9 +122,9 @@ compilation_unit {
       members {
         function {
           name: "Op"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -175,7 +175,7 @@ compilation_unit {
                               field: "x"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
@@ -203,7 +203,7 @@ compilation_unit {
                               field: "y"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
diff --git a/explorer/fuzzing/fuzzer_corpus/4e2e3a112f5ac1b2e5e21b378de5fde998463a7f b/explorer/fuzzing/fuzzer_corpus/f3f2ce5f3ef7d5b033427003ec082ed78391df42
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/4e2e3a112f5ac1b2e5e21b378de5fde998463a7f
rename to explorer/fuzzing/fuzzer_corpus/f3f2ce5f3ef7d5b033427003ec082ed78391df42
index d75ddcc6e00d..3d93a5b4d345 100644
--- a/explorer/fuzzing/fuzzer_corpus/4e2e3a112f5ac1b2e5e21b378de5fde998463a7f
+++ b/explorer/fuzzing/fuzzer_corpus/f3f2ce5f3ef7d5b033427003ec082ed78391df42
@@ -24,9 +24,9 @@ compilation_unit {
       members {
         function {
           name: "Add"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -67,9 +67,9 @@ compilation_unit {
       members {
         function {
           name: "Scale"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -205,9 +205,9 @@ compilation_unit {
           members {
             function {
               name: "Add"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -258,7 +258,7 @@ compilation_unit {
                                   field: "x"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -286,7 +286,7 @@ compilation_unit {
                                   field: "y"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -314,9 +314,9 @@ compilation_unit {
           members {
             function {
               name: "Scale"
-              me_pattern {
+              self_pattern {
                 binding_pattern {
-                  name: "me"
+                  name: "self"
                   type {
                     expression_pattern {
                       expression {
@@ -366,7 +366,7 @@ compilation_unit {
                                   field: "x"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
@@ -389,7 +389,7 @@ compilation_unit {
                                   field: "y"
                                   object {
                                     identifier {
-                                      name: "me"
+                                      name: "self"
                                     }
                                   }
                                 }
diff --git a/explorer/fuzzing/fuzzer_corpus/a93d78ff6b92a94fd898b80f8db179e2dbb62d90 b/explorer/fuzzing/fuzzer_corpus/f60600b7084679149329733b3d150860b3b0ea41
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/a93d78ff6b92a94fd898b80f8db179e2dbb62d90
rename to explorer/fuzzing/fuzzer_corpus/f60600b7084679149329733b3d150860b3b0ea41
index ca9326c23007..d5965cfca8f7 100644
--- a/explorer/fuzzing/fuzzer_corpus/a93d78ff6b92a94fd898b80f8db179e2dbb62d90
+++ b/explorer/fuzzing/fuzzer_corpus/f60600b7084679149329733b3d150860b3b0ea41
@@ -21,9 +21,9 @@ compilation_unit {
       members {
         function {
           name: "G"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
diff --git a/explorer/fuzzing/fuzzer_corpus/e85d679550764150cfa3b7194a67b372f9633407 b/explorer/fuzzing/fuzzer_corpus/f6b30690735283f02587055b9f8f5ae0a7833e60
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/e85d679550764150cfa3b7194a67b372f9633407
rename to explorer/fuzzing/fuzzer_corpus/f6b30690735283f02587055b9f8f5ae0a7833e60
index 2c3e0ca38751..f4de977b4cb6 100644
--- a/explorer/fuzzing/fuzzer_corpus/e85d679550764150cfa3b7194a67b372f9633407
+++ b/explorer/fuzzing/fuzzer_corpus/f6b30690735283f02587055b9f8f5ae0a7833e60
@@ -69,9 +69,9 @@ compilation_unit {
       members {
         function {
           name: "Op"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -121,7 +121,7 @@ compilation_unit {
                               field: "n"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
diff --git a/explorer/fuzzing/fuzzer_corpus/5d1cfa0ed766c3848d3bdbcb2de620686b853497 b/explorer/fuzzing/fuzzer_corpus/f8b0b8c01e46fe26a68c42f31dcd54a8fddbf011
similarity index 97%
rename from explorer/fuzzing/fuzzer_corpus/5d1cfa0ed766c3848d3bdbcb2de620686b853497
rename to explorer/fuzzing/fuzzer_corpus/f8b0b8c01e46fe26a68c42f31dcd54a8fddbf011
index 8b14dada05f5..93c8993c7884 100644
--- a/explorer/fuzzing/fuzzer_corpus/5d1cfa0ed766c3848d3bdbcb2de620686b853497
+++ b/explorer/fuzzing/fuzzer_corpus/f8b0b8c01e46fe26a68c42f31dcd54a8fddbf011
@@ -45,9 +45,9 @@ compilation_unit {
       members {
         function {
           name: "Convert"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -91,7 +91,7 @@ compilation_unit {
                             op: Add
                             arguments {
                               identifier {
-                                name: "me"
+                                name: "self"
                               }
                             }
                             arguments {
diff --git a/explorer/fuzzing/fuzzer_corpus/5cdd5d171c4525f74fdb042e28a7aa2d29d14cba b/explorer/fuzzing/fuzzer_corpus/f8e82fe960f00a94db12d993ddf332f5cdf1717b
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/5cdd5d171c4525f74fdb042e28a7aa2d29d14cba
rename to explorer/fuzzing/fuzzer_corpus/f8e82fe960f00a94db12d993ddf332f5cdf1717b
index 3cd4ad61671d..53cee216ee1a 100644
--- a/explorer/fuzzing/fuzzer_corpus/5cdd5d171c4525f74fdb042e28a7aa2d29d14cba
+++ b/explorer/fuzzing/fuzzer_corpus/f8e82fe960f00a94db12d993ddf332f5cdf1717b
@@ -9,9 +9,9 @@ compilation_unit {
       members {
         function {
           name: "F"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -62,7 +62,7 @@ compilation_unit {
                               field: "n"
                               object {
                                 identifier {
-                                  name: "me"
+                                  name: "self"
                                 }
                               }
                             }
diff --git a/explorer/fuzzing/fuzzer_corpus/6996653200d462dd89901ddd415dbb7196fa6006 b/explorer/fuzzing/fuzzer_corpus/f90c2ddd0d3fd69d9b4300cd9165c33e5d948566
similarity index 98%
rename from explorer/fuzzing/fuzzer_corpus/6996653200d462dd89901ddd415dbb7196fa6006
rename to explorer/fuzzing/fuzzer_corpus/f90c2ddd0d3fd69d9b4300cd9165c33e5d948566
index 1cf002008084..0b23574bb03f 100644
--- a/explorer/fuzzing/fuzzer_corpus/6996653200d462dd89901ddd415dbb7196fa6006
+++ b/explorer/fuzzing/fuzzer_corpus/f90c2ddd0d3fd69d9b4300cd9165c33e5d948566
@@ -144,9 +144,9 @@ compilation_unit {
       members {
         function {
           name: "Convert"
-          me_pattern {
+          self_pattern {
             binding_pattern {
-              name: "me"
+              name: "self"
               type {
                 expression_pattern {
                   expression {
@@ -176,7 +176,7 @@ compilation_unit {
                     field: "v"
                     object {
                       identifier {
-                        name: "me"
+                        name: "self"
                       }
                     }
                   }
diff --git a/explorer/interpreter/impl_scope.h b/explorer/interpreter/impl_scope.h
index fcaa16ee91f6..f6066da18bb9 100644
--- a/explorer/interpreter/impl_scope.h
+++ b/explorer/interpreter/impl_scope.h
@@ -24,11 +24,11 @@ class TypeChecker;
 //
 //     class C(U:! Type, T:! Type)  {
 //       class D(V:! Type where U is Fooable(T)) {
-//         fn bar[me: Self](x: U, y : T) -> T{
+//         fn bar[self: Self](x: U, y : T) -> T{
 //           return x.foo(y)
 //         }
 //       }
-//       fn baz[me: Self](x: U, y : T) -> T {
+//       fn baz[self: Self](x: U, y : T) -> T {
 //         return x.foo(y);
 //       }
 //     }
diff --git a/explorer/interpreter/interpreter.cpp b/explorer/interpreter/interpreter.cpp
index 2aa69a975b60..e8a700065697 100644
--- a/explorer/interpreter/interpreter.cpp
+++ b/explorer/interpreter/interpreter.cpp
@@ -872,7 +872,7 @@ auto Interpreter::CallDestructor(Nonnull<const DestructorDeclaration*> fun,
   BindingMap generic_args;
 
   // TODO: move this logic into PatternMatch, and call it here.
-  auto p = &method.me_pattern().value();
+  auto p = &method.self_pattern().value();
   const auto& placeholder = cast<BindingPlaceholderValue>(*p);
   if (placeholder.value_node().has_value()) {
     method_scope.Bind(*placeholder.value_node(), receiver);
@@ -953,8 +953,8 @@ auto Interpreter::CallFunction(const CallExpression& call,
                   call.source_loc()));
       RuntimeScope method_scope(&heap_);
       BindingMap generic_args;
-      // Bind the receiver to the `me` parameter.
-      auto p = &method.me_pattern().value();
+      // Bind the receiver to the `self` parameter.
+      auto p = &method.self_pattern().value();
       if (p->kind() == Value::Kind::BindingPlaceholderValue) {
         // TODO: move this logic into PatternMatch
         const auto& placeholder = cast<BindingPlaceholderValue>(*p);
@@ -962,7 +962,7 @@ auto Interpreter::CallFunction(const CallExpression& call,
           method_scope.Bind(*placeholder.value_node(), m.receiver());
         }
       } else {
-        CARBON_CHECK(PatternMatch(&method.me_pattern().value(), m.receiver(),
+        CARBON_CHECK(PatternMatch(&method.self_pattern().value(), m.receiver(),
                                   call.source_loc(), &method_scope,
                                   generic_args, trace_stream_, this->arena_));
       }
diff --git a/explorer/interpreter/resolve_names.cpp b/explorer/interpreter/resolve_names.cpp
index 8e4c8724750d..68d2db4f0941 100644
--- a/explorer/interpreter/resolve_names.cpp
+++ b/explorer/interpreter/resolve_names.cpp
@@ -568,7 +568,7 @@ static auto ResolveNames(Declaration& declaration, StaticScope& enclosing_scope,
       }
       if (function.is_method()) {
         CARBON_RETURN_IF_ERROR(
-            ResolveNames(function.me_pattern(), function_scope));
+            ResolveNames(function.self_pattern(), function_scope));
       }
       CARBON_RETURN_IF_ERROR(
           ResolveNames(function.param_pattern(), function_scope));
diff --git a/explorer/interpreter/type_checker.cpp b/explorer/interpreter/type_checker.cpp
index dc65d77f88f9..8f81b2756269 100644
--- a/explorer/interpreter/type_checker.cpp
+++ b/explorer/interpreter/type_checker.cpp
@@ -2429,10 +2429,10 @@ auto TypeChecker::CheckAddrMeAccess(
     Nonnull<const FunctionDeclaration*> func_decl, const Bindings& bindings,
     const ImplScope& impl_scope) -> ErrorOr<Success> {
   if (func_decl->is_method() &&
-      func_decl->me_pattern().kind() == PatternKind::AddrPattern) {
+      func_decl->self_pattern().kind() == PatternKind::AddrPattern) {
     access->set_is_addr_me_method();
     Nonnull<const Value*> me_type =
-        Substitute(bindings, &func_decl->me_pattern().static_type());
+        Substitute(bindings, &func_decl->self_pattern().static_type());
     CARBON_RETURN_IF_ERROR(
         ExpectExactType(access->source_loc(), "method access, receiver type",
                         me_type, &access->object().static_type(), impl_scope));
@@ -4380,9 +4380,9 @@ auto TypeChecker::DeclareCallableDeclaration(Nonnull<CallableDeclaration*> f,
   // Type check the receiver pattern.
   if (f->is_method()) {
     CARBON_RETURN_IF_ERROR(TypeCheckPattern(
-        &f->me_pattern(), std::nullopt, function_scope, ValueCategory::Let));
-    CollectGenericBindingsInPattern(&f->me_pattern(), deduced_bindings);
-    CollectImplBindingsInPattern(&f->me_pattern(), impl_bindings);
+        &f->self_pattern(), std::nullopt, function_scope, ValueCategory::Let));
+    CollectGenericBindingsInPattern(&f->self_pattern(), deduced_bindings);
+    CollectImplBindingsInPattern(&f->self_pattern(), impl_bindings);
   }
   // Type check the parameter pattern.
   CARBON_RETURN_IF_ERROR(TypeCheckPattern(&f->param_pattern(), std::nullopt,
diff --git a/explorer/interpreter/type_checker.h b/explorer/interpreter/type_checker.h
index ea1ac7338084..15acf8a42192 100644
--- a/explorer/interpreter/type_checker.h
+++ b/explorer/interpreter/type_checker.h
@@ -130,9 +130,9 @@ class TypeChecker {
     Nonnull<const Declaration*> member;
   };
 
-  // Checks a member access that might be accessing a function taking `addr me:
-  // Self*`. If it does, this function marks the member access accordingly and
-  // ensures the object argument is an lvalue.
+  // Checks a member access that might be accessing a function taking `addr
+  // self: Self*`. If it does, this function marks the member access accordingly
+  // and ensures the object argument is an lvalue.
   auto CheckAddrMeAccess(Nonnull<MemberAccessExpression*> access,
                          Nonnull<const FunctionDeclaration*> func_decl,
                          const Bindings& bindings, const ImplScope& impl_scope)
diff --git a/explorer/interpreter/value.cpp b/explorer/interpreter/value.cpp
index bf2898efd09a..a26126271ccf 100644
--- a/explorer/interpreter/value.cpp
+++ b/explorer/interpreter/value.cpp
@@ -353,7 +353,7 @@ void Value::Print(llvm::raw_ostream& out) const {
     case Value::Kind::DestructorValue: {
       const auto& destructor = cast<DestructorValue>(*this);
       out << "destructor [ ";
-      out << destructor.declaration().me_pattern();
+      out << destructor.declaration().self_pattern();
       out << " ]";
       break;
     }
diff --git a/explorer/interpreter/value.h b/explorer/interpreter/value.h
index d5ff558fc7de..e4463947a579 100644
--- a/explorer/interpreter/value.h
+++ b/explorer/interpreter/value.h
@@ -91,7 +91,7 @@ class Value {
   LLVM_DUMP_METHOD void Dump() const { Print(llvm::errs()); }
 
   // Returns the sub-Value specified by `path`, which must be a valid field
-  // path for *this. If the sub-Value is a method and its me_pattern is an
+  // path for *this. If the sub-Value is a method and its self_pattern is an
   // AddrPattern, then pass the LValue representing the receiver as `me_value`,
   // otherwise pass `*this`.
   auto GetMember(Nonnull<Arena*> arena, const FieldPath& path,
diff --git a/explorer/testdata/addr/fail_method_let.carbon b/explorer/testdata/addr/fail_method_let.carbon
index 5e72f9455333..527720e9fd10 100644
--- a/explorer/testdata/addr/fail_method_let.carbon
+++ b/explorer/testdata/addr/fail_method_let.carbon
@@ -14,9 +14,9 @@ class Point {
     return {.x = 0, .y = 0};
   }
 
-  fn GetSetX[addr me: Point*](x: i32) -> i32 {
-    var old: auto = (*me).x;
-    (*me).x = x;
+  fn GetSetX[addr self: Point*](x: i32) -> i32 {
+    var old: auto = (*self).x;
+    (*self).x = x;
     return old;
   }
 
diff --git a/explorer/testdata/addr/fail_method_me_misspelled.carbon b/explorer/testdata/addr/fail_method_self_misspelled.carbon
similarity index 76%
rename from explorer/testdata/addr/fail_method_me_misspelled.carbon
rename to explorer/testdata/addr/fail_method_self_misspelled.carbon
index 2de5a0fbf401..3add9d679873 100644
--- a/explorer/testdata/addr/fail_method_me_misspelled.carbon
+++ b/explorer/testdata/addr/fail_method_self_misspelled.carbon
@@ -9,8 +9,8 @@
 package ExplorerTest api;
 
 class C {
-  // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/addr/fail_method_me_misspelled.carbon:[[@LINE+1]]: illegal binding pattern in implicit parameter list
-  fn F[addr mew: Self*]() {}
+  // CHECK:STDERR: SYNTAX ERROR: {{.*}}/explorer/testdata/addr/fail_method_self_misspelled.carbon:[[@LINE+1]]: illegal binding pattern in implicit parameter list
+  fn F[addr slef: Self*]() {}
 }
 
 fn Main() -> i32 { return 0; }
diff --git a/explorer/testdata/addr/fail_method_me_type.carbon b/explorer/testdata/addr/fail_method_self_type.carbon
similarity index 79%
rename from explorer/testdata/addr/fail_method_me_type.carbon
rename to explorer/testdata/addr/fail_method_self_type.carbon
index 584309d7a716..71f83ebe3a5f 100644
--- a/explorer/testdata/addr/fail_method_me_type.carbon
+++ b/explorer/testdata/addr/fail_method_self_type.carbon
@@ -18,9 +18,9 @@ class Point {
     return {.x = 0, .y = 0};
   }
 
-  fn GetSetX[addr me: Shape*](x: i32) -> i32 {
-    var old: auto = (*me).x;
-    (*me).x = x;
+  fn GetSetX[addr self: Shape*](x: i32) -> i32 {
+    var old: auto = (*self).x;
+    (*self).x = x;
     return old;
   }
 
@@ -30,7 +30,7 @@ class Point {
 
 fn Main() -> i32 {
   var p: Point = Point.Origin();
-  // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/addr/fail_method_me_type.carbon:[[@LINE+3]]: type error in method access, receiver type
+  // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/addr/fail_method_self_type.carbon:[[@LINE+3]]: type error in method access, receiver type
   // CHECK:STDERR: expected: class Shape
   // CHECK:STDERR: actual: class Point
   var x: auto = p.GetSetX(42);
diff --git a/explorer/testdata/addr/method.carbon b/explorer/testdata/addr/method.carbon
index b9dc607ea94c..6d577b8a8aaa 100644
--- a/explorer/testdata/addr/method.carbon
+++ b/explorer/testdata/addr/method.carbon
@@ -15,9 +15,9 @@ class Point {
     return {.x = 0, .y = 0};
   }
 
-  fn GetSetX[addr me: Point*](x: i32) -> i32 {
-    var old: auto = (*me).x;
-    (*me).x = x;
+  fn GetSetX[addr self: Point*](x: i32) -> i32 {
+    var old: auto = (*self).x;
+    (*self).x = x;
     return old;
   }
 
diff --git a/explorer/testdata/addr/nested_method.carbon b/explorer/testdata/addr/nested_method.carbon
index 388421724f64..3f4d3a71c063 100644
--- a/explorer/testdata/addr/nested_method.carbon
+++ b/explorer/testdata/addr/nested_method.carbon
@@ -13,9 +13,9 @@ package ExplorerTest api;
 class B {
   var x: i32;
 
-  fn GetSetX[addr me: Self*](x: i32) -> i32 {
-    var oldX: auto = (*me).x;
-    (*me).x = x;
+  fn GetSetX[addr self: Self*](x: i32) -> i32 {
+    var oldX: auto = (*self).x;
+    (*self).x = x;
     return oldX;
   }
 }
diff --git a/explorer/testdata/alias/class_alias.carbon b/explorer/testdata/alias/class_alias.carbon
index 694c9a398b5d..9b45598ea0ce 100644
--- a/explorer/testdata/alias/class_alias.carbon
+++ b/explorer/testdata/alias/class_alias.carbon
@@ -13,16 +13,16 @@
 package ExplorerTest api;
 
 interface Addable {
-  fn Add[me: Self](k: i32) -> Self;
+  fn Add[self: Self](k: i32) -> Self;
 }
 impl i32 as Addable {
-  fn Add[me: Self](k: i32) -> Self { return me + k; }
+  fn Add[self: Self](k: i32) -> Self { return self + k; }
 }
 
 class Class { var n: i32; }
 class GenericClass(T:! Addable) {
   var m: T;
-  fn Get[me: Self](n: i32) -> T { return me.m.Add(n); }
+  fn Get[self: Self](n: i32) -> T { return self.m.Add(n); }
 }
 
 alias ClassAlias = Class;
diff --git a/explorer/testdata/alias/member_name_alias.carbon b/explorer/testdata/alias/member_name_alias.carbon
index b941c255931f..f6f59cf315b3 100644
--- a/explorer/testdata/alias/member_name_alias.carbon
+++ b/explorer/testdata/alias/member_name_alias.carbon
@@ -11,19 +11,19 @@ package ExplorerTest api;
 
 interface I {
   fn F() -> i32;
-  fn M[me: Self]() -> i32;
+  fn M[self: Self]() -> i32;
 }
 class A {
   var n: i32;
   impl as I {
     fn F() -> i32 { return 1; }
-    fn M[me: Self]() -> i32 { return 2; }
+    fn M[self: Self]() -> i32 { return 2; }
   }
-  fn G[me: Self]() -> i32 { return 3; }
+  fn G[self: Self]() -> i32 { return 3; }
 }
 impl i32 as I {
   fn F() -> i32 { return 4; }
-  fn M[me: Self]() -> i32 { return 5; }
+  fn M[self: Self]() -> i32 { return 5; }
 }
 
 alias IF = I.F;
diff --git a/explorer/testdata/array/element_convertible_to_type.carbon b/explorer/testdata/array/element_convertible_to_type.carbon
index 64e1e20bd6f3..f3f0d066e262 100644
--- a/explorer/testdata/array/element_convertible_to_type.carbon
+++ b/explorer/testdata/array/element_convertible_to_type.carbon
@@ -11,7 +11,7 @@ package ExplorerTest api;
 
 class TypeLike {
   impl as ImplicitAs(Type) {
-    fn Convert[me: Self]() -> Type { return i32; }
+    fn Convert[self: Self]() -> Type { return i32; }
   }
   fn Make() -> Self { return {}; }
 }
diff --git a/explorer/testdata/as/convert.carbon b/explorer/testdata/as/convert.carbon
index 1e1a07e4c5a7..94fdd6c00873 100644
--- a/explorer/testdata/as/convert.carbon
+++ b/explorer/testdata/as/convert.carbon
@@ -12,7 +12,7 @@ package ExplorerTest api;
 class A { var n: i32; }
 
 external impl A as As(i32) {
-  fn Convert[me: Self]() -> i32 { return me.n; }
+  fn Convert[self: Self]() -> i32 { return self.n; }
 }
 
 fn Main() -> i32 {
diff --git a/explorer/testdata/as/implicit_as.carbon b/explorer/testdata/as/implicit_as.carbon
index 5315f7f8caca..e632d9d77ea8 100644
--- a/explorer/testdata/as/implicit_as.carbon
+++ b/explorer/testdata/as/implicit_as.carbon
@@ -12,7 +12,7 @@ package ExplorerTest api;
 class A { var n: i32; }
 
 external impl A as ImplicitAs(i32) {
-  fn Convert[me: Self]() -> i32 { return me.n; }
+  fn Convert[self: Self]() -> i32 { return self.n; }
 }
 
 fn Main() -> i32 {
diff --git a/explorer/testdata/assign/convert_rhs.carbon b/explorer/testdata/assign/convert_rhs.carbon
index d31ab9bfd2df..78e0f72d2788 100644
--- a/explorer/testdata/assign/convert_rhs.carbon
+++ b/explorer/testdata/assign/convert_rhs.carbon
@@ -13,7 +13,7 @@ class A {
   var n: i32;
 }
 impl i32 as ImplicitAs(A) {
-  fn Convert[me: Self]() -> A { return {.n = me }; }
+  fn Convert[self: Self]() -> A { return {.n = self }; }
 }
 
 fn Main() -> i32 {
diff --git a/explorer/testdata/assoc_const/fail_missing_equal.carbon b/explorer/testdata/assoc_const/fail_missing_equal.carbon
index 9578fb9d6ccd..301dc97cd8b1 100644
--- a/explorer/testdata/assoc_const/fail_missing_equal.carbon
+++ b/explorer/testdata/assoc_const/fail_missing_equal.carbon
@@ -10,7 +10,7 @@ package ExplorerTest api;
 
 interface Container {
   let Element:! Type;
-  fn Front[me: Self]() -> Element;
+  fn Front[self: Self]() -> Element;
 }
 
 fn A[T:! Container where .Element == i32](x: T) -> T.Element {
diff --git a/explorer/testdata/assoc_const/fail_missing_rewrite.carbon b/explorer/testdata/assoc_const/fail_missing_rewrite.carbon
index 6a74e85b98c8..2397e48443d7 100644
--- a/explorer/testdata/assoc_const/fail_missing_rewrite.carbon
+++ b/explorer/testdata/assoc_const/fail_missing_rewrite.carbon
@@ -10,7 +10,7 @@ package ExplorerTest api;
 
 interface Container {
   let Element:! Type;
-  fn Front[me: Self]() -> Element;
+  fn Front[self: Self]() -> Element;
 }
 
 fn A[T:! Container where .Element = i32](x: T) -> T.Element {
diff --git a/explorer/testdata/assoc_const/fail_multiple_deduction.carbon b/explorer/testdata/assoc_const/fail_multiple_deduction.carbon
index dc1ea02bb034..1021e549b66e 100644
--- a/explorer/testdata/assoc_const/fail_multiple_deduction.carbon
+++ b/explorer/testdata/assoc_const/fail_multiple_deduction.carbon
@@ -12,7 +12,7 @@ interface HasThreeTypes {
   let A:! Type;
   let B:! Type;
   let C:! Type;
-  fn Make[me: Self]() -> (A, B, C);
+  fn Make[self: Self]() -> (A, B, C);
 }
 fn F[T:! Type](x: (T, T, T));
 fn G[X:! HasThreeTypes where .A == .B and .B == .C and .C == .A](x: X) {
diff --git a/explorer/testdata/assoc_const/impl_lookup.carbon b/explorer/testdata/assoc_const/impl_lookup.carbon
index 17fcc72af32a..a3ead62280db 100644
--- a/explorer/testdata/assoc_const/impl_lookup.carbon
+++ b/explorer/testdata/assoc_const/impl_lookup.carbon
@@ -11,7 +11,7 @@ package ExplorerTest api;
 
 interface Frob {
   let Result:! Type;
-  fn F[me: Self]() -> Result;
+  fn F[self: Self]() -> Result;
 }
 
 fn Use[T:! Frob](x: T) -> T.Result {
@@ -22,12 +22,12 @@ fn Use[T:! Frob](x: T) -> T.Result {
 class AlmostI32 {
   var val: i32;
   impl as ImplicitAs(i32) {
-    fn Convert[me: Self]() -> i32 { return me.val; }
+    fn Convert[self: Self]() -> i32 { return self.val; }
   }
 }
 
 impl i32 as Frob where .Result = AlmostI32 {
-  fn F[me: Self]() -> AlmostI32 { return {.val = me}; }
+  fn F[self: Self]() -> AlmostI32 { return {.val = self}; }
 }
 
 fn Main() -> i32 {
diff --git a/explorer/testdata/assoc_const/lookup_in_rewrite.carbon b/explorer/testdata/assoc_const/lookup_in_rewrite.carbon
index c7d767e5499c..b4675ded64a7 100644
--- a/explorer/testdata/assoc_const/lookup_in_rewrite.carbon
+++ b/explorer/testdata/assoc_const/lookup_in_rewrite.carbon
@@ -19,18 +19,18 @@
 package ExplorerTest api;
 
 interface Hashable {
-  fn Hash[me: Self]() -> i32;
+  fn Hash[self: Self]() -> i32;
 }
 
 class Potato {
   external impl as Hashable {
-    fn Hash[me: Self]() -> i32 {
+    fn Hash[self: Self]() -> i32 {
       Print("Potato.(Hashable.Hash)");
       return 1;
     }
   }
 
-  fn Hash[me: Self]() -> i32 {
+  fn Hash[self: Self]() -> i32 {
     Print("Potato.Hash");
     return 2;
   }
@@ -42,9 +42,9 @@ interface Maker {
 }
 
 external impl i32 as Hashable {
-  fn Hash[me: Self]() -> i32 {
+  fn Hash[self: Self]() -> i32 {
     Print("i32.Hash");
-    return me;
+    return self;
   }
 }
 
diff --git a/explorer/testdata/assoc_const/pass_equal_to_rewrite.carbon b/explorer/testdata/assoc_const/pass_equal_to_rewrite.carbon
index 315fc8711f0b..df68c49f5d1b 100644
--- a/explorer/testdata/assoc_const/pass_equal_to_rewrite.carbon
+++ b/explorer/testdata/assoc_const/pass_equal_to_rewrite.carbon
@@ -11,7 +11,7 @@ package ExplorerTest api;
 
 interface Container {
   let Element:! Type;
-  fn Front[me: Self]() -> Element;
+  fn Front[self: Self]() -> Element;
 }
 
 fn A[T:! Container where .Element = i32](x: T) -> T.Element {
@@ -23,8 +23,8 @@ fn B[T:! Container where .Element == i32](x: T) -> T.Element {
 }
 
 external impl (i32, i32) as Container where .Element = i32 {
-  fn Front[me: Self]() -> i32 {
-    let (a: i32, b: i32) = me;
+  fn Front[self: Self]() -> i32 {
+    let (a: i32, b: i32) = self;
     return a;
   }
 }
diff --git a/explorer/testdata/assoc_const/pass_rewrite_to_equal.carbon b/explorer/testdata/assoc_const/pass_rewrite_to_equal.carbon
index c3a2d467f3a1..8f696aedc349 100644
--- a/explorer/testdata/assoc_const/pass_rewrite_to_equal.carbon
+++ b/explorer/testdata/assoc_const/pass_rewrite_to_equal.carbon
@@ -11,7 +11,7 @@ package ExplorerTest api;
 
 interface Container {
   let Element:! Type;
-  fn Front[me: Self]() -> Element;
+  fn Front[self: Self]() -> Element;
 }
 
 fn A[T:! Container where .Element == i32](x: T) -> T.Element {
@@ -23,8 +23,8 @@ fn B[T:! Container where .Element = i32](x: T) -> T.Element {
 }
 
 external impl (i32, i32) as Container where .Element = i32 {
-  fn Front[me: Self]() -> i32 {
-    let (a: i32, b: i32) = me;
+  fn Front[self: Self]() -> i32 {
+    let (a: i32, b: i32) = self;
     return a;
   }
 }
diff --git a/explorer/testdata/assoc_const/rewrite_large_type.carbon b/explorer/testdata/assoc_const/rewrite_large_type.carbon
index 8f82b208defd..a50cf4086525 100644
--- a/explorer/testdata/assoc_const/rewrite_large_type.carbon
+++ b/explorer/testdata/assoc_const/rewrite_large_type.carbon
@@ -47,13 +47,13 @@ fn DoSplat(
   return CallSplat(M.T0, n);
 }
 
-interface First { fn Op[me: Self]() -> i32; }
+interface First { fn Op[self: Self]() -> i32; }
 impl i32 as First {
-  fn Op[me: Self]() -> i32 { return me; }
+  fn Op[self: Self]() -> i32 { return self; }
 }
 impl forall [T:! First] (T, T, T) as First {
-  fn Op[me: Self]() -> i32 {
-    let (a: T, b: T, c: T) = me;
+  fn Op[self: Self]() -> i32 {
+    let (a: T, b: T, c: T) = self;
     return a.Op();
   }
 }
diff --git a/explorer/testdata/assoc_const/simple_constraint.carbon b/explorer/testdata/assoc_const/simple_constraint.carbon
index cfb3e416ccf4..33e545f337d2 100644
--- a/explorer/testdata/assoc_const/simple_constraint.carbon
+++ b/explorer/testdata/assoc_const/simple_constraint.carbon
@@ -11,7 +11,7 @@ package ExplorerTest api;
 
 interface Frob {
   let Result:! Type;
-  fn F[me: Self]() -> Result;
+  fn F[self: Self]() -> Result;
 }
 
 fn Use[T:! Frob where .Result = .Self](x: T) -> T {
@@ -20,7 +20,7 @@ fn Use[T:! Frob where .Result = .Self](x: T) -> T {
 }
 
 impl i32 as Frob where .Result = i32 {
-  fn F[me: Self]() -> i32 { return me + 1; }
+  fn F[self: Self]() -> i32 { return self + 1; }
 }
 
 fn Main() -> i32 {
diff --git a/explorer/testdata/assoc_const/simple_equality.carbon b/explorer/testdata/assoc_const/simple_equality.carbon
index 53ade772d37e..d292f72c722d 100644
--- a/explorer/testdata/assoc_const/simple_equality.carbon
+++ b/explorer/testdata/assoc_const/simple_equality.carbon
@@ -11,7 +11,7 @@ package ExplorerTest api;
 
 interface Frob {
   let Result:! Type;
-  fn F[me: Self]() -> Result;
+  fn F[self: Self]() -> Result;
 }
 
 fn Use[T:! Frob](x: T) -> T.Result {
@@ -20,7 +20,7 @@ fn Use[T:! Frob](x: T) -> T.Result {
 }
 
 impl i32 as Frob where .Result = i32 {
-  fn F[me: Self]() -> i32 { return 0; }
+  fn F[self: Self]() -> i32 { return 0; }
 }
 
 fn Main() -> i32 {
diff --git a/explorer/testdata/choice/generic_choice_nested_in_template_class.carbon b/explorer/testdata/choice/generic_choice_nested_in_template_class.carbon
index b9732b6de098..44f92f1d6ecc 100644
--- a/explorer/testdata/choice/generic_choice_nested_in_template_class.carbon
+++ b/explorer/testdata/choice/generic_choice_nested_in_template_class.carbon
@@ -24,17 +24,17 @@ class MyOptional(T:! Type){
        return { .element = MyOptionalElement(T).Element(value) };
    }
 
-    fn has_value[me: Self] () -> bool{
-        var x: MyOptionalElement(T) = me.element;
+    fn has_value[self: Self] () -> bool{
+        var x: MyOptionalElement(T) = self.element;
         match(x){
             case MyOptionalElement(T).None() => { return false; }
         }
         return false;
     }
 
-    fn get[me: Self] () -> T {
+    fn get[self: Self] () -> T {
         var y: T;
-        var x: MyOptionalElement(T) = me.element;
+        var x: MyOptionalElement(T) = self.element;
         match(x){
             case MyOptionalElement(T).Element( var x: T ) =>{
                 return x;
diff --git a/explorer/testdata/class/bound_method.carbon b/explorer/testdata/class/bound_method.carbon
index 588accab42fd..c4276aad32dc 100644
--- a/explorer/testdata/class/bound_method.carbon
+++ b/explorer/testdata/class/bound_method.carbon
@@ -13,8 +13,8 @@ class Point {
   fn Origin() -> Point {
     return {.x = 0, .y = 0};
   }
-  fn GetX[me: Point]() -> i32 {
-    return me.x;
+  fn GetX[self: Point]() -> i32 {
+    return self.x;
   }
   var x: i32;
   var y: i32;
diff --git a/explorer/testdata/class/class_inheritance_methods.carbon b/explorer/testdata/class/class_inheritance_methods.carbon
index 3b09b8f92c4b..766d96acad39 100644
--- a/explorer/testdata/class/class_inheritance_methods.carbon
+++ b/explorer/testdata/class/class_inheritance_methods.carbon
@@ -15,16 +15,16 @@ base class C {
   fn BasePrint(v: i32) {
     Print("Class {0}", v);
   }
-  fn Method1[me:Self]() {
-    me.BasePrint(me.value_c);
+  fn Method1[self: Self]() {
+    self.BasePrint(self.value_c);
   }
 
   var value_c: i32;
 }
 
 class D extends C {
-  fn Method2[me:Self]() {
-    me.BasePrint(me.value_d);
+  fn Method2[self: Self]() {
+    self.BasePrint(self.value_d);
   }
 
   var value_d: i32;
diff --git a/explorer/testdata/class/class_inheritance_shadow.carbon b/explorer/testdata/class/class_inheritance_shadow.carbon
index 26e69ce46194..e352fd1e99d4 100644
--- a/explorer/testdata/class/class_inheritance_shadow.carbon
+++ b/explorer/testdata/class/class_inheritance_shadow.carbon
@@ -16,8 +16,8 @@ base class C {
   fn Method1() {
     Print("Class C");
   }
-  fn GetValue[me: Self]() -> i32 {
-    return me.value;
+  fn GetValue[self: Self]() -> i32 {
+    return self.value;
   }
   var value: i32;
 }
diff --git a/explorer/testdata/class/empty_class.carbon b/explorer/testdata/class/empty_class.carbon
index 39373084c43f..c7e82dd7a5c3 100644
--- a/explorer/testdata/class/empty_class.carbon
+++ b/explorer/testdata/class/empty_class.carbon
@@ -9,7 +9,7 @@
 
 package ExplorerTest api;
 
-class A { fn F[me: Self]() -> i32 { return 0; } }
+class A { fn F[self: Self]() -> i32 { return 0; } }
 
 fn Main() -> i32 {
   // {} is a bit strange: its type is {}. Make sure we can properly convert a
diff --git a/explorer/testdata/class/fail_method_deduced.carbon b/explorer/testdata/class/fail_method_deduced.carbon
index 81662a4e0eb4..0b6179589aa1 100644
--- a/explorer/testdata/class/fail_method_deduced.carbon
+++ b/explorer/testdata/class/fail_method_deduced.carbon
@@ -10,7 +10,7 @@ package ExplorerTest api;
 
 class C {
   fn F() {}
-  fn G[me: Self]() {}
+  fn G[self: Self]() {}
 }
 
 fn H[T:! Type](x: T) {}
diff --git a/explorer/testdata/class/fail_method_from_class.carbon b/explorer/testdata/class/fail_method_from_class.carbon
index 14cb1ca2a039..09e62eb54513 100644
--- a/explorer/testdata/class/fail_method_from_class.carbon
+++ b/explorer/testdata/class/fail_method_from_class.carbon
@@ -13,8 +13,8 @@ class Point {
     return {.x = 0, .y = 0};
   }
 
-  fn GetX[me: Point]() -> i32 {
-    return me.x;
+  fn GetX[self: Point]() -> i32 {
+    return self.x;
   }
 
   var x: i32;
diff --git a/explorer/testdata/class/fail_method_in_var.carbon b/explorer/testdata/class/fail_method_in_var.carbon
index 2e83439e4c0f..547038e240d3 100644
--- a/explorer/testdata/class/fail_method_in_var.carbon
+++ b/explorer/testdata/class/fail_method_in_var.carbon
@@ -10,7 +10,7 @@ package ExplorerTest api;
 
 class C {
   fn F() {}
-  fn G[me: Self]() {}
+  fn G[self: Self]() {}
 }
 
 fn Main() -> i32 {
diff --git a/explorer/testdata/class/fail_return_method.carbon b/explorer/testdata/class/fail_return_method.carbon
index 47bfa41b69ff..0ca1b7978053 100644
--- a/explorer/testdata/class/fail_return_method.carbon
+++ b/explorer/testdata/class/fail_return_method.carbon
@@ -10,7 +10,7 @@ package ExplorerTest api;
 
 class C {
   fn F() {}
-  fn G[me: Self]() {}
+  fn G[self: Self]() {}
 }
 
 fn ReturnF() -> auto { return C.F; }
diff --git a/explorer/testdata/class/method.carbon b/explorer/testdata/class/method.carbon
index 1c8c9cfb4552..c7c8c6eb8da3 100644
--- a/explorer/testdata/class/method.carbon
+++ b/explorer/testdata/class/method.carbon
@@ -14,8 +14,8 @@ class Point {
     return {.x = 0, .y = 0};
   }
 
-  fn GetX[me: Point]() -> i32 {
-    return me.x;
+  fn GetX[self: Point]() -> i32 {
+    return self.x;
   }
 
   var x: i32;
diff --git a/explorer/testdata/class/method_call_method.carbon b/explorer/testdata/class/method_call_method.carbon
index 10df7cf180c4..b66d45c69a30 100644
--- a/explorer/testdata/class/method_call_method.carbon
+++ b/explorer/testdata/class/method_call_method.carbon
@@ -14,12 +14,12 @@ class Point {
     return {.x = 0, .y = 0};
   }
 
-  fn GetX[me: Point]() -> i32 {
-    return me.x;
+  fn GetX[self: Point]() -> i32 {
+    return self.x;
   }
 
-  fn GetXY[me: Point]() -> (i32, i32) {
-    return (me.GetX(), me.y);
+  fn GetXY[self: Point]() -> (i32, i32) {
+    return (self.GetX(), self.y);
   }
 
   var x: i32;
diff --git a/explorer/testdata/class/method_self.carbon b/explorer/testdata/class/method_self.carbon
index 99f96c6ad78f..15b98347591e 100644
--- a/explorer/testdata/class/method_self.carbon
+++ b/explorer/testdata/class/method_self.carbon
@@ -15,8 +15,8 @@ class Point {
   }
 
   // Allowed: `Self` here means `Point`.
-  fn GetX[me: Self]() -> i32 {
-    return me.x;
+  fn GetX[self: Self]() -> i32 {
+    return self.x;
   }
 
   var x: i32;
diff --git a/explorer/testdata/class/parametrized_base_class.carbon b/explorer/testdata/class/parametrized_base_class.carbon
index 7f514a20e2af..d921a78120c0 100644
--- a/explorer/testdata/class/parametrized_base_class.carbon
+++ b/explorer/testdata/class/parametrized_base_class.carbon
@@ -13,12 +13,12 @@ package ExplorerTest api;
 
 interface Number {
   fn Zero() -> Self;
-  fn Add[me: Self](other: Self) -> Self;
+  fn Add[self: Self](other: Self) -> Self;
 }
 
 external impl i32 as Number {
   fn Zero() -> i32 { return 0; }
-  fn Add[me: i32](other: i32) -> i32 { return me + other; }
+  fn Add[self: i32](other: i32) -> i32 { return self + other; }
 }
 
 base class A(T:! Number) {
diff --git a/explorer/testdata/comparison/custom_equality.carbon b/explorer/testdata/comparison/custom_equality.carbon
index 4cf7152732cf..02a5174cd8b0 100644
--- a/explorer/testdata/comparison/custom_equality.carbon
+++ b/explorer/testdata/comparison/custom_equality.carbon
@@ -15,11 +15,11 @@ class MyType {
   var value: i32;
 
   impl as EqWith(Self) {
-    fn Equal[me: Self](other: Self) -> bool {
-      return me.value == other.value;
+    fn Equal[self: Self](other: Self) -> bool {
+      return self.value == other.value;
     }
-    fn NotEqual[me: Self](other: Self) -> bool{
-      return me.value != other.value;
+    fn NotEqual[self: Self](other: Self) -> bool{
+      return self.value != other.value;
     }
   }
 }
diff --git a/explorer/testdata/comparison/empty_struct.carbon b/explorer/testdata/comparison/empty_struct.carbon
index f2b05c524661..a0e349b2dc10 100644
--- a/explorer/testdata/comparison/empty_struct.carbon
+++ b/explorer/testdata/comparison/empty_struct.carbon
@@ -10,10 +10,10 @@
 package ExplorerTest api;
 
 external impl {} as EqWith({}) {
-  fn Equal[me: Self](other: Self) -> bool {
+  fn Equal[self: Self](other: Self) -> bool {
     return true;
   }
-  fn NotEqual[me: Self](other: Self) -> bool {
+  fn NotEqual[self: Self](other: Self) -> bool {
     return false;
   }
 }
diff --git a/explorer/testdata/constraint/binding_self.carbon b/explorer/testdata/constraint/binding_self.carbon
index 7d4bc74208a0..4966c8d42415 100644
--- a/explorer/testdata/constraint/binding_self.carbon
+++ b/explorer/testdata/constraint/binding_self.carbon
@@ -10,11 +10,11 @@
 package ExplorerTest api;
 
 interface SwizzleWith(T:! Type) {
-  fn Op[me: Self](x: T) -> i32;
+  fn Op[self: Self](x: T) -> i32;
 }
 
 impl i32 as SwizzleWith(i32) {
-  fn Op[me: Self](x: Self) -> Self { return me * 10 + x; }
+  fn Op[self: Self](x: Self) -> Self { return self * 10 + x; }
 }
 
 fn F[T:! SwizzleWith(.Self)](v: T, w: T) -> i32 {
diff --git a/explorer/testdata/constraint/where_self.carbon b/explorer/testdata/constraint/where_self.carbon
index afd8ef3ef569..88ad51151025 100644
--- a/explorer/testdata/constraint/where_self.carbon
+++ b/explorer/testdata/constraint/where_self.carbon
@@ -10,7 +10,7 @@
 package ExplorerTest api;
 
 interface SwizzleWith(T:! Type) {
-  fn Op[me: Self](x: T) -> i32;
+  fn Op[self: Self](x: T) -> i32;
 }
 
 // TODO: There should be some way to write this that includes
@@ -18,7 +18,7 @@ interface SwizzleWith(T:! Type) {
 alias Swizzle = Type where .Self is SwizzleWith(.Self);
 
 impl i32 as SwizzleWith(i32) {
-  fn Op[me: Self](x: Self) -> Self { return me * 10 + x; }
+  fn Op[self: Self](x: Self) -> Self { return self * 10 + x; }
 }
 
 fn F[T:! Swizzle](v: T, w: T) -> i32 {
diff --git a/explorer/testdata/destructor/call_destructor_from_destructor.carbon b/explorer/testdata/destructor/call_destructor_from_destructor.carbon
index 03eed7311062..db065a734707 100644
--- a/explorer/testdata/destructor/call_destructor_from_destructor.carbon
+++ b/explorer/testdata/destructor/call_destructor_from_destructor.carbon
@@ -15,8 +15,8 @@
 package ExplorerTest api;
 
 class A{
-    destructor[me: Self]{
-        Print("DESTRUCTOR A {0}",me.n);
+    destructor[self: Self]{
+        Print("DESTRUCTOR A {0}",self.n);
     }
     fn Create(x: i32) -> A{
         return {.n = x};
@@ -25,8 +25,8 @@ class A{
 }
 
 class B{
-    destructor[me: Self]{
-        Print("DESTRUCTOR B {0}",me.n);
+    destructor[self: Self]{
+        Print("DESTRUCTOR B {0}",self.n);
     }
     fn Create(x: i32) -> B{
        return {.n = x, .a1 = A.Create(4),.a2 = A.Create(3) };
diff --git a/explorer/testdata/destructor/destroy_array.carbon b/explorer/testdata/destructor/destroy_array.carbon
index 7eece6582c07..0ba85222d9de 100644
--- a/explorer/testdata/destructor/destroy_array.carbon
+++ b/explorer/testdata/destructor/destroy_array.carbon
@@ -17,8 +17,8 @@ package ExplorerTest api;
 
 
 class A{
-    destructor[me: Self]{
-        Print("DESTRUCTOR A {0}",me.n);
+    destructor[self: Self]{
+        Print("DESTRUCTOR A {0}",self.n);
     }
     var n: i32;
 }
diff --git a/explorer/testdata/destructor/destroy_different_types.carbon b/explorer/testdata/destructor/destroy_different_types.carbon
index a50169586502..1e79258d91ad 100644
--- a/explorer/testdata/destructor/destroy_different_types.carbon
+++ b/explorer/testdata/destructor/destroy_different_types.carbon
@@ -14,8 +14,8 @@ package ExplorerTest api;
 
 
 class A{
-    destructor[me: Self]{
-        Print("DESTRUCTOR A {0}",me.n);
+    destructor[self: Self]{
+        Print("DESTRUCTOR A {0}",self.n);
     }
     var n: i32;
 }
diff --git a/explorer/testdata/destructor/destroy_inner_destructor.carbon b/explorer/testdata/destructor/destroy_inner_destructor.carbon
index 138dba31a037..894ab2b49664 100644
--- a/explorer/testdata/destructor/destroy_inner_destructor.carbon
+++ b/explorer/testdata/destructor/destroy_inner_destructor.carbon
@@ -13,8 +13,8 @@ package ExplorerTest api;
 
 class A{
     class B{
-        destructor[me: Self]{
-            Print("DESTRUCTOR B {0}",me.n);
+        destructor[self: Self]{
+            Print("DESTRUCTOR B {0}",self.n);
         }
         fn Create(x: i32) -> B{
            return {.n = x };
@@ -22,8 +22,8 @@ class A{
         var n: i32;
     }
 
-    destructor[me: Self]{
-        Print("DESTRUCTOR A {0}",me.n);
+    destructor[self: Self]{
+        Print("DESTRUCTOR A {0}",self.n);
     }
     fn Create(x: i32) -> A{
         return {.n = x, .b = B.Create(2)};
diff --git a/explorer/testdata/destructor/destructor_with_return.carbon b/explorer/testdata/destructor/destructor_with_return.carbon
index 66f1f3787347..24fc688873ca 100644
--- a/explorer/testdata/destructor/destructor_with_return.carbon
+++ b/explorer/testdata/destructor/destructor_with_return.carbon
@@ -11,9 +11,9 @@
 package ExplorerTest api;
 
 class A{
-    destructor[me: Self]{
-        Print("DESTRUCTOR A {0}",me.n);
-        if(me.n == 3){
+    destructor[self: Self]{
+        Print("DESTRUCTOR A {0}",self.n);
+        if(self.n == 3){
             return;
         }
         Print("DESTRUCTOR A: This message should not printed");
diff --git a/explorer/testdata/destructor/dont_call_in_method.carbon b/explorer/testdata/destructor/dont_call_in_method.carbon
index 3e116bf2d731..9f45847e4731 100644
--- a/explorer/testdata/destructor/dont_call_in_method.carbon
+++ b/explorer/testdata/destructor/dont_call_in_method.carbon
@@ -17,13 +17,13 @@ class B{
 }
 
 class A{
-    destructor[me: Self]{
-        Print("DESTRUCTOR A {0}",me.n);
+    destructor[self: Self]{
+        Print("DESTRUCTOR A {0}",self.n);
     }
-    fn test[me: Self](){
+    fn test[self: Self](){
         Print("TEST");
     }
-    fn test2[me: Self](){
+    fn test2[self: Self](){
         Print("TEST 2");
     }
     var n: i32;
diff --git a/explorer/testdata/destructor/fail_multiple_destructor_declaration.carbon b/explorer/testdata/destructor/fail_multiple_destructor_declaration.carbon
index b98d53ee2198..8a9dc96cb9bc 100644
--- a/explorer/testdata/destructor/fail_multiple_destructor_declaration.carbon
+++ b/explorer/testdata/destructor/fail_multiple_destructor_declaration.carbon
@@ -9,11 +9,11 @@
 package ExplorerTest api;
 
 class A{
-    destructor[me: Self]{
-        Print("DESTRUCTOR A1 {0}",me.n);
+    destructor[self: Self]{
+        Print("DESTRUCTOR A1 {0}",self.n);
     }
-    destructor[me: Self]{
-        Print("DESTRUCTOR A2 {0}",me.n);
+    destructor[self: Self]{
+        Print("DESTRUCTOR A2 {0}",self.n);
     // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/destructor/fail_multiple_destructor_declaration.carbon:[[@LINE+1]]: Duplicate name `destructor` also found at {{.*}}/explorer/testdata/destructor/fail_multiple_destructor_declaration.carbon:[[@LINE-3]]
     }
     var n: i32;
diff --git a/explorer/testdata/destructor/function_with_return.carbon b/explorer/testdata/destructor/function_with_return.carbon
index 6b703f01a419..e3f1f39eb489 100644
--- a/explorer/testdata/destructor/function_with_return.carbon
+++ b/explorer/testdata/destructor/function_with_return.carbon
@@ -13,22 +13,22 @@
 package ExplorerTest api;
 
 class A{
-    destructor[me: Self]{
-        Print("DESTRUCTOR A {0}",me.n);
+    destructor[self: Self]{
+        Print("DESTRUCTOR A {0}",self.n);
     }
     var n: i32;
 }
 
 class B{
-    destructor[me: Self]{
-        Print("DESTRUCTOR B {0}",me.n);
+    destructor[self: Self]{
+        Print("DESTRUCTOR B {0}",self.n);
     }
     var n: i32;
 }
 
 class C{
-    destructor[me: Self]{
-        Print("DESTRUCTOR C {0}",me.n);
+    destructor[self: Self]{
+        Print("DESTRUCTOR C {0}",self.n);
     }
     var n: i32;
 }
diff --git a/explorer/testdata/destructor/loop_block.carbon b/explorer/testdata/destructor/loop_block.carbon
index 67b23ad3cc65..362253ff83e8 100644
--- a/explorer/testdata/destructor/loop_block.carbon
+++ b/explorer/testdata/destructor/loop_block.carbon
@@ -16,8 +16,8 @@
 package ExplorerTest api;
 
 class A{
-    destructor[me: Self]{
-        Print("DESTRUCTOR A {0}",me.n);
+    destructor[self: Self]{
+        Print("DESTRUCTOR A {0}",self.n);
     }
     var n: i32;
 }
diff --git a/explorer/testdata/destructor/loop_break_continue.carbon b/explorer/testdata/destructor/loop_break_continue.carbon
index 8779a90a7bdb..9a590b0e268a 100644
--- a/explorer/testdata/destructor/loop_break_continue.carbon
+++ b/explorer/testdata/destructor/loop_break_continue.carbon
@@ -21,8 +21,8 @@
 package ExplorerTest api;
 
 class A{
-    destructor[me: Self]{
-        Print("DESTRUCTOR A {0}",me.n);
+    destructor[self: Self]{
+        Print("DESTRUCTOR A {0}",self.n);
     }
     var n: i32;
 }
diff --git a/explorer/testdata/destructor/nested_block_with_return.carbon b/explorer/testdata/destructor/nested_block_with_return.carbon
index 3a19d6380643..0b9ffd740ccf 100644
--- a/explorer/testdata/destructor/nested_block_with_return.carbon
+++ b/explorer/testdata/destructor/nested_block_with_return.carbon
@@ -14,8 +14,8 @@
 package ExplorerTest api;
 
 class A{
-    destructor[me: Self]{
-        Print("DESTRUCTOR A {0}",me.n);
+    destructor[self: Self]{
+        Print("DESTRUCTOR A {0}",self.n);
     }
     var n: i32;
 }
diff --git a/explorer/testdata/experimental_continuation/convert_run.carbon b/explorer/testdata/experimental_continuation/convert_run.carbon
index 2af35de8a7df..6af315b59637 100644
--- a/explorer/testdata/experimental_continuation/convert_run.carbon
+++ b/explorer/testdata/experimental_continuation/convert_run.carbon
@@ -15,8 +15,8 @@ class Wrap(T:! Type) {
 fn MakeWrap[T:! Type](x: T) -> Wrap(T) { return {.v = x}; }
 
 impl forall [T:! Type] Wrap(T) as ImplicitAs(T) {
-  fn Convert[me: Self]() -> T {
-    return me.v;
+  fn Convert[self: Self]() -> T {
+    return self.v;
   }
 }
 
diff --git a/explorer/testdata/function/convert_args.carbon b/explorer/testdata/function/convert_args.carbon
index 2899d6584f8f..aa2b38cb8d70 100644
--- a/explorer/testdata/function/convert_args.carbon
+++ b/explorer/testdata/function/convert_args.carbon
@@ -11,19 +11,19 @@ package ExplorerTest api;
 
 class One {
   impl One as ImplicitAs(i32) {
-    fn Convert[me: Self]() -> i32 { return 1; }
+    fn Convert[self: Self]() -> i32 { return 1; }
   }
 }
 
 class Two {
   impl Two as ImplicitAs(i32) {
-    fn Convert[me: Self]() -> i32 { return 2; }
+    fn Convert[self: Self]() -> i32 { return 2; }
   }
 }
 
 class N {
   impl N as ImplicitAs(i32) {
-    fn Convert[me: Self]() -> i32 { return me.n; }
+    fn Convert[self: Self]() -> i32 { return self.n; }
   }
   var n: i32;
 }
diff --git a/explorer/testdata/function/return_convertible_to_type.carbon b/explorer/testdata/function/return_convertible_to_type.carbon
index 15a2ddc1a41c..242936d4ae66 100644
--- a/explorer/testdata/function/return_convertible_to_type.carbon
+++ b/explorer/testdata/function/return_convertible_to_type.carbon
@@ -11,7 +11,7 @@ package ExplorerTest api;
 
 class TypeLike {
   impl as ImplicitAs(Type) {
-    fn Convert[me: Self]() -> Type { return i32; }
+    fn Convert[self: Self]() -> Type { return i32; }
   }
   fn Make() -> Self { return {}; }
 }
diff --git a/explorer/testdata/generic_class/class_function.carbon b/explorer/testdata/generic_class/class_function.carbon
index f8fc0b8b24c7..39c20996e7e1 100644
--- a/explorer/testdata/generic_class/class_function.carbon
+++ b/explorer/testdata/generic_class/class_function.carbon
@@ -11,7 +11,7 @@ package ExplorerTest api;
 
 interface Number {
   fn Zero() -> Self;
-  fn Add[me: Self](other: Self) -> Self;
+  fn Add[self: Self](other: Self) -> Self;
 }
 
 class Point(T:! Number) {
@@ -30,7 +30,7 @@ class Point(T:! Number) {
 
 external impl i32 as Number {
   fn Zero() -> i32 { return 0; }
-  fn Add[me: i32](other: i32) -> i32 { return me + other; }
+  fn Add[self: i32](other: i32) -> i32 { return self + other; }
 }
 
 fn Main() -> i32 {
diff --git a/explorer/testdata/generic_class/fail_args_mismatch.carbon b/explorer/testdata/generic_class/fail_args_mismatch.carbon
index 30c9a0433824..c846e047b9a3 100644
--- a/explorer/testdata/generic_class/fail_args_mismatch.carbon
+++ b/explorer/testdata/generic_class/fail_args_mismatch.carbon
@@ -15,8 +15,8 @@ class Point(T:! Type) {
     return {.x = zero, .y = zero};
   }
 
-  fn GetX[me: Point(T, T)]() -> T {
-    return me.x;
+  fn GetX[self: Point(T, T)]() -> T {
+    return self.x;
   }
 
   var x: T;
diff --git a/explorer/testdata/generic_class/fail_bad_parameter_type.carbon b/explorer/testdata/generic_class/fail_bad_parameter_type.carbon
index 26e179955679..8176e080fe53 100644
--- a/explorer/testdata/generic_class/fail_bad_parameter_type.carbon
+++ b/explorer/testdata/generic_class/fail_bad_parameter_type.carbon
@@ -14,8 +14,8 @@ class Point(T:! i32) {
     return {.x = zero, .y = zero};
   }
 
-  fn GetX[me: Point(T)]() -> T {
-    return me.x;
+  fn GetX[self: Point(T)]() -> T {
+    return self.x;
   }
 
   var x: T;
diff --git a/explorer/testdata/generic_class/fail_no_args.carbon b/explorer/testdata/generic_class/fail_no_args.carbon
index 6a8d5aec5a7d..1952585c93f0 100644
--- a/explorer/testdata/generic_class/fail_no_args.carbon
+++ b/explorer/testdata/generic_class/fail_no_args.carbon
@@ -15,8 +15,8 @@ class Point(T:! Type) {
 
   // Error: wrote `Point` instead of `Point(T)`, `Point` by itself is not a type.
   // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/generic_class/fail_no_args.carbon:[[@LINE+1]]: 'Point' must be given an argument list
-  fn GetX[me: Point]() -> T {
-    return me.x;
+  fn GetX[self: Point]() -> T {
+    return self.x;
   }
 
   var x: T;
diff --git a/explorer/testdata/generic_class/fail_self_with_arg.carbon b/explorer/testdata/generic_class/fail_self_with_arg.carbon
index 9dfb791211f9..2e593a70dade 100644
--- a/explorer/testdata/generic_class/fail_self_with_arg.carbon
+++ b/explorer/testdata/generic_class/fail_self_with_arg.carbon
@@ -17,8 +17,8 @@ class Point(T:! Type) {
   }
 
   // Error: wrote `Self(T)` instead of `Self`.
-  fn GetX[me: Self(T)]() -> T {
-    return me.x;
+  fn GetX[self: Self(T)]() -> T {
+    return self.x;
   }
 
   var x: T;
diff --git a/explorer/testdata/generic_class/fail_two_arg_lists.carbon b/explorer/testdata/generic_class/fail_two_arg_lists.carbon
index ad55183f8fab..57df4031541a 100644
--- a/explorer/testdata/generic_class/fail_two_arg_lists.carbon
+++ b/explorer/testdata/generic_class/fail_two_arg_lists.carbon
@@ -14,8 +14,8 @@ class Point(T:! Type) {
     return {.x = zero, .y = zero};
   }
 
-  fn GetX[me: Point(T)(T)]() -> T {
-    return me.x;
+  fn GetX[self: Point(T)(T)]() -> T {
+    return self.x;
   }
 
   var x: T;
diff --git a/explorer/testdata/generic_class/generic_class_substitution.carbon b/explorer/testdata/generic_class/generic_class_substitution.carbon
index b0f4136f3d81..42e97899c49e 100644
--- a/explorer/testdata/generic_class/generic_class_substitution.carbon
+++ b/explorer/testdata/generic_class/generic_class_substitution.carbon
@@ -11,7 +11,7 @@ package ExplorerTest api;
 
 interface Number {
   fn Zero() -> Self;
-  fn Add[me: Self](other: Self) -> Self;
+  fn Add[self: Self](other: Self) -> Self;
 }
 
 class Point(T:! Number) {
@@ -24,7 +24,7 @@ class Point(T:! Number) {
 
 external impl i32 as Number {
   fn Zero() -> i32 { return 0; }
-  fn Add[me: i32](other: i32) -> i32 { return me + other; }
+  fn Add[self: i32](other: i32) -> i32 { return self + other; }
 }
 
 fn SumXY[U:! Number](p: Point(U)) -> U {
diff --git a/explorer/testdata/generic_class/generic_fun_and_class.carbon b/explorer/testdata/generic_class/generic_fun_and_class.carbon
index 880460fbb596..09afd7d407b2 100644
--- a/explorer/testdata/generic_class/generic_fun_and_class.carbon
+++ b/explorer/testdata/generic_class/generic_fun_and_class.carbon
@@ -11,7 +11,7 @@ package ExplorerTest api;
 
 interface Number {
   fn Zero() -> Self;
-  fn Add[me: Self](other: Self) -> Self;
+  fn Add[self: Self](other: Self) -> Self;
 }
 
 class Point(T:! Number) {
@@ -33,7 +33,7 @@ fn SumXY[U :! Number](other: Point(U)) -> U {
 
 external impl i32 as Number {
   fn Zero() -> i32 { return 0; }
-  fn Add[me: i32](other: i32) -> i32 { return me + other; }
+  fn Add[self: i32](other: i32) -> i32 { return self + other; }
 }
 
 fn Main() -> i32 {
diff --git a/explorer/testdata/generic_class/generic_point.carbon b/explorer/testdata/generic_class/generic_point.carbon
index 5fe771426dc3..c4f8ca66870d 100644
--- a/explorer/testdata/generic_class/generic_point.carbon
+++ b/explorer/testdata/generic_class/generic_point.carbon
@@ -14,8 +14,8 @@ class Point(T:! Type) {
     return {.x = zero, .y = zero};
   }
 
-  fn GetX[me: Point(T)]() -> T {
-    return me.x;
+  fn GetX[self: Point(T)]() -> T {
+    return self.x;
   }
 
   var x: T;
diff --git a/explorer/testdata/generic_class/impl_with_argument.carbon b/explorer/testdata/generic_class/impl_with_argument.carbon
index f334393e5d52..8d00afec38e1 100644
--- a/explorer/testdata/generic_class/impl_with_argument.carbon
+++ b/explorer/testdata/generic_class/impl_with_argument.carbon
@@ -11,8 +11,8 @@ package ExplorerTest api;
 
 interface Vector {
   fn Zero() -> Self;
-  fn Add[me: Self](b: Self) -> Self;
-  fn Scale[me: Self](v: i32) -> Self;
+  fn Add[self: Self](b: Self) -> Self;
+  fn Scale[self: Self](v: i32) -> Self;
 }
 
 class Point(T:! Type) {
@@ -26,12 +26,12 @@ external impl Point(i32) as Vector {
     return {.x = 0, .y = 0};
   }
 
-  fn Add[me: Point(i32)](b: Point(i32)) -> Point(i32) {
-    return {.x = me.x + b.x, .y = me.y + b.y};
+  fn Add[self: Point(i32)](b: Point(i32)) -> Point(i32) {
+    return {.x = self.x + b.x, .y = self.y + b.y};
   }
 
-  fn Scale[me: Point(i32)](v: i32) -> Point(i32) {
-    return {.x = me.x * v, .y = me.y * v};
+  fn Scale[self: Point(i32)](v: i32) -> Point(i32) {
+    return {.x = self.x * v, .y = self.y * v};
   }
 }
 
diff --git a/explorer/testdata/generic_class/impl_with_self.carbon b/explorer/testdata/generic_class/impl_with_self.carbon
index 1f3a1cda4de8..340d8c10423f 100644
--- a/explorer/testdata/generic_class/impl_with_self.carbon
+++ b/explorer/testdata/generic_class/impl_with_self.carbon
@@ -11,8 +11,8 @@ package ExplorerTest api;
 
 interface Vector {
   fn Zero() -> Self;
-  fn Add[me: Self](b: Self) -> Self;
-  fn Scale[me: Self](v: i32) -> Self;
+  fn Add[self: Self](b: Self) -> Self;
+  fn Scale[self: Self](v: i32) -> Self;
 }
 
 class Point(T:! Type) {
@@ -26,12 +26,12 @@ external impl Point(i32) as Vector {
     return {.x = 0, .y = 0};
   }
 
-  fn Add[me: Self](b: Self) -> Self {
-    return {.x = me.x + b.x, .y = me.y + b.y};
+  fn Add[self: Self](b: Self) -> Self {
+    return {.x = self.x + b.x, .y = self.y + b.y};
   }
 
-  fn Scale[me: Self](v: i32) -> Self {
-    return {.x = me.x * v, .y = me.y * v};
+  fn Scale[self: Self](v: i32) -> Self {
+    return {.x = self.x * v, .y = self.y * v};
   }
 }
 
diff --git a/explorer/testdata/generic_class/param_with_dependent_type.carbon b/explorer/testdata/generic_class/param_with_dependent_type.carbon
index 66acd2198a6a..ad7d5948e726 100644
--- a/explorer/testdata/generic_class/param_with_dependent_type.carbon
+++ b/explorer/testdata/generic_class/param_with_dependent_type.carbon
@@ -10,7 +10,7 @@
 package ExplorerTest api;
 
 class Point(T:! Type, V:! T) {
-  fn Get[me: Self]() -> T {
+  fn Get[self: Self]() -> T {
     return V;
   }
 }
diff --git a/explorer/testdata/generic_class/parameter_type_conversion.carbon b/explorer/testdata/generic_class/parameter_type_conversion.carbon
index 15e853ae5e38..67b60971c7a4 100644
--- a/explorer/testdata/generic_class/parameter_type_conversion.carbon
+++ b/explorer/testdata/generic_class/parameter_type_conversion.carbon
@@ -17,7 +17,7 @@ class Holder(N:! i32) {
 
 class IntLike {
   impl as ImplicitAs(i32) {
-    fn Convert[me: Self]() -> i32 { return 4; }
+    fn Convert[self: Self]() -> i32 { return 4; }
   }
   fn Make() -> IntLike { return {}; }
 }
diff --git a/explorer/testdata/generic_class/point_with_interface.carbon b/explorer/testdata/generic_class/point_with_interface.carbon
index 74f1032cc32a..27dd4ce2c31e 100644
--- a/explorer/testdata/generic_class/point_with_interface.carbon
+++ b/explorer/testdata/generic_class/point_with_interface.carbon
@@ -11,18 +11,18 @@ package ExplorerTest api;
 
 interface Number {
   fn Zero() -> Self;
-  fn Add[me: Self](other: Self) -> Self;
+  fn Add[self: Self](other: Self) -> Self;
 }
 
 class Point(T:! Number) {
   fn Origin() -> Point(T) {
     return {.x = T.Zero(), .y = T.Zero()};
   }
-  fn Clone[me: Point(T)]() -> Point(T) {
-    return {.x = me.x, .y = me.y};
+  fn Clone[self: Point(T)]() -> Point(T) {
+    return {.x = self.x, .y = self.y};
   }
-  fn SumXY[me: Point(T)]() -> T {
-    return me.x.Add(me.y);
+  fn SumXY[self: Point(T)]() -> T {
+    return self.x.Add(self.y);
   }
   var x: T;
   var y: T;
@@ -30,7 +30,7 @@ class Point(T:! Number) {
 
 external impl i32 as Number {
   fn Zero() -> i32 { return 0; }
-  fn Add[me: i32](other: i32) -> i32 { return me + other; }
+  fn Add[self: i32](other: i32) -> i32 { return self + other; }
 }
 
 fn Main() -> i32 {
diff --git a/explorer/testdata/generic_class/use_self.carbon b/explorer/testdata/generic_class/use_self.carbon
index 9fa4f2ac31f6..74c1e537c8ba 100644
--- a/explorer/testdata/generic_class/use_self.carbon
+++ b/explorer/testdata/generic_class/use_self.carbon
@@ -15,8 +15,8 @@ class Point(T:! Type) {
     return {.x = zero, .y = zero};
   }
 
-  fn GetX[me: Self]() -> T {
-    return me.x;
+  fn GetX[self: Self]() -> T {
+    return self.x;
   }
 
   var x: T;
diff --git a/explorer/testdata/generic_function/generic_method.carbon b/explorer/testdata/generic_function/generic_method.carbon
index 545618901d0a..ebfc046dd975 100644
--- a/explorer/testdata/generic_function/generic_method.carbon
+++ b/explorer/testdata/generic_function/generic_method.carbon
@@ -12,13 +12,13 @@ package ExplorerTest api;
 class Cell(T:! Type) {
   fn Create(x: T) -> Cell(T) { return { .data = x }; }
 
-  fn Get[me: Self]() -> T {
-    return me.data;
+  fn Get[self: Self]() -> T {
+    return self.data;
   }
-  fn Put[addr me: Self*](x: T) {
-    (*me).data = x;
+  fn Put[addr self: Self*](x: T) {
+    (*self).data = x;
   }
-  fn CreateOther[me: Self, U:! Type](x: U) -> Cell(U) {
+  fn CreateOther[self: Self, U:! Type](x: U) -> Cell(U) {
     return {.data = x};
   }
   var data: T;
diff --git a/explorer/testdata/generic_function/implicit_conversion.carbon b/explorer/testdata/generic_function/implicit_conversion.carbon
index 70f9421c318f..e907463d71e1 100644
--- a/explorer/testdata/generic_function/implicit_conversion.carbon
+++ b/explorer/testdata/generic_function/implicit_conversion.carbon
@@ -10,10 +10,10 @@
 package ExplorerTest api;
 
 interface IntLike {
-  fn Convert[me: Self]() -> i32;
+  fn Convert[self: Self]() -> i32;
 }
 impl i32 as IntLike {
-  fn Convert[me: i32]() -> i32 { return me; }
+  fn Convert[self: i32]() -> i32 { return self; }
 }
 
 fn add[T:! IntLike](x: {.a: T, .b: ({.m: i32, .n: T}, i32)}) -> i32 {
diff --git a/explorer/testdata/global_variable/implicit_conversion.carbon b/explorer/testdata/global_variable/implicit_conversion.carbon
index 32290635d803..9d8c5abca0e4 100644
--- a/explorer/testdata/global_variable/implicit_conversion.carbon
+++ b/explorer/testdata/global_variable/implicit_conversion.carbon
@@ -13,7 +13,7 @@ class A {
   var n: i32;
 }
 impl i32 as ImplicitAs(A) {
-  fn Convert[me: Self]() -> A { return {.n = me}; }
+  fn Convert[self: Self]() -> A { return {.n = self}; }
 }
 
 var a: A = 5;
diff --git a/explorer/testdata/if_else/convert_condition.carbon b/explorer/testdata/if_else/convert_condition.carbon
index 54e40c9b5a25..7ab2bfa6feb2 100644
--- a/explorer/testdata/if_else/convert_condition.carbon
+++ b/explorer/testdata/if_else/convert_condition.carbon
@@ -13,8 +13,8 @@ class LazyEq {
   var v1: i32;
   var v2: i32;
   impl as ImplicitAs(bool) {
-    fn Convert[me: Self]() -> bool {
-      return me.v1 == me.v2;
+    fn Convert[self: Self]() -> bool {
+      return self.v1 == self.v2;
     }
   }
   fn Make(v1: i32, v2: i32) -> Self {
diff --git a/explorer/testdata/if_expression/convert_condition.carbon b/explorer/testdata/if_expression/convert_condition.carbon
index 488ea1825ed5..a42474b70487 100644
--- a/explorer/testdata/if_expression/convert_condition.carbon
+++ b/explorer/testdata/if_expression/convert_condition.carbon
@@ -13,8 +13,8 @@ class LazyEq {
   var v1: i32;
   var v2: i32;
   impl as ImplicitAs(bool) {
-    fn Convert[me: Self]() -> bool {
-      return me.v1 == me.v2;
+    fn Convert[self: Self]() -> bool {
+      return self.v1 == self.v2;
     }
   }
   fn Make(v1: i32, v2: i32) -> Self {
diff --git a/explorer/testdata/impl/fail_ambiguous_impl.carbon b/explorer/testdata/impl/fail_ambiguous_impl.carbon
index 18008961118c..8416e344b935 100644
--- a/explorer/testdata/impl/fail_ambiguous_impl.carbon
+++ b/explorer/testdata/impl/fail_ambiguous_impl.carbon
@@ -10,8 +10,8 @@
 package ExplorerTest api;
 
 interface Vector {
-  fn Add[me: Self](b: Self) -> Self;
-  fn Scale[me: Self](v: i32) -> Self;
+  fn Add[self: Self](b: Self) -> Self;
+  fn Scale[self: Self](v: i32) -> Self;
 }
 
 class Point {
@@ -20,20 +20,20 @@ class Point {
 }
 
 external impl Point as Vector {
-  fn Add[me: Point](b: Point) -> Point {
-      return {.x = me.x + b.x, .y = me.y + b.y};
+  fn Add[self: Point](b: Point) -> Point {
+      return {.x = self.x + b.x, .y = self.y + b.y};
   }
-  fn Scale[me: Point](v: i32) -> Point {
-      return {.x = me.x * v, .y = me.y * v};
+  fn Scale[self: Point](v: i32) -> Point {
+      return {.x = self.x * v, .y = self.y * v};
   }
 }
 
 external impl Point as Vector {
-  fn Add[me: Point](b: Point) -> Point {
-      return {.x = me.x + b.x, .y = me.y + b.y};
+  fn Add[self: Point](b: Point) -> Point {
+      return {.x = self.x + b.x, .y = self.y + b.y};
   }
-  fn Scale[me: Point](v: i32) -> Point {
-      return {.x = me.x * v, .y = me.y * v};
+  fn Scale[self: Point](v: i32) -> Point {
+      return {.x = self.x * v, .y = self.y * v};
   }
 // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/impl/fail_ambiguous_impl.carbon:[[@LINE+1]]: ambiguous implementations of interface Vector for class Point
 }
diff --git a/explorer/testdata/impl/fail_unambiguous_impl_generic.carbon b/explorer/testdata/impl/fail_unambiguous_impl_generic.carbon
index 4273801c8f4f..85ea1f5003eb 100644
--- a/explorer/testdata/impl/fail_unambiguous_impl_generic.carbon
+++ b/explorer/testdata/impl/fail_unambiguous_impl_generic.carbon
@@ -9,8 +9,8 @@
 package ExplorerTest api;
 
 interface Vector(T:! Type) {
-  fn Add[me: Self](b: Self) -> Self;
-  fn Scale[me: Self](v: T) -> Self;
+  fn Add[self: Self](b: Self) -> Self;
+  fn Scale[self: Self](v: T) -> Self;
 }
 
 class Point(T:! Type) {
@@ -19,20 +19,20 @@ class Point(T:! Type) {
 }
 
 external impl Point(i32) as Vector(i32) {
-  fn Add[me: Self](b: Self) -> Self {
-    return {.x = me.x + b.x, .y = me.y + b.y};
+  fn Add[self: Self](b: Self) -> Self {
+    return {.x = self.x + b.x, .y = self.y + b.y};
   }
-  fn Scale[me: Self](v: i32) -> Self {
-    return {.x = me.x * v, .y = me.y * v};
+  fn Scale[self: Self](v: i32) -> Self {
+    return {.x = self.x * v, .y = self.y * v};
   }
 }
 
 external impl forall [T:! Type] Point(T) as Vector(T) {
-  fn Add[me: Self](b: Self) -> Self {
-    return me;
+  fn Add[self: Self](b: Self) -> Self {
+    return self;
   }
-  fn Scale[me: Self](v: T) -> Self {
-    return me;
+  fn Scale[self: Self](v: T) -> Self {
+    return self;
   }
 }
 
diff --git a/explorer/testdata/impl/generic_method_impl.carbon b/explorer/testdata/impl/generic_method_impl.carbon
index 7ce19caf6219..3b53e29712ce 100644
--- a/explorer/testdata/impl/generic_method_impl.carbon
+++ b/explorer/testdata/impl/generic_method_impl.carbon
@@ -12,16 +12,16 @@ package ExplorerTest api;
 class Cell(T:! Type) {
   fn Create(x: T) -> Cell(T) { return { .data = x }; }
 
-  fn Get[me: Self]() -> T {
-    return me.data;
+  fn Get[self: Self]() -> T {
+    return self.data;
   }
-  fn Put[addr me: Self*](x: T) {
-    (*me).data = x;
+  fn Put[addr self: Self*](x: T) {
+    (*self).data = x;
   }
-  fn Update[addr me: Self*, U:! ImplicitAs(T)](x: U) {
-    (*me).data = x;
+  fn Update[addr self: Self*, U:! ImplicitAs(T)](x: U) {
+    (*self).data = x;
   }
-  fn CreateOther[me: Self, U:! Type](x: U) -> Cell(U) {
+  fn CreateOther[self: Self, U:! Type](x: U) -> Cell(U) {
     return {.data = x};
   }
   var data: T;
diff --git a/explorer/testdata/impl/impl_in_generic_class.carbon b/explorer/testdata/impl/impl_in_generic_class.carbon
index 255477eceddb..b98af14ca2f7 100644
--- a/explorer/testdata/impl/impl_in_generic_class.carbon
+++ b/explorer/testdata/impl/impl_in_generic_class.carbon
@@ -10,12 +10,12 @@
 package ExplorerTest api;
 
 interface I(T:! Type) {
-  fn F[me: Self](t: T, o: Self) -> Self;
+  fn F[self: Self](t: T, o: Self) -> Self;
 }
 
 class X(U:! Type) {
   impl as I(U) {
-    fn F[me: Self](u: U, o: Self) -> Self { return {.m = u, .n = me.n + o.n}; }
+    fn F[self: Self](u: U, o: Self) -> Self { return {.m = u, .n = self.n + o.n}; }
   }
   var m: U;
   var n: i32;
diff --git a/explorer/testdata/impl/param_impl.carbon b/explorer/testdata/impl/param_impl.carbon
index f804e5ebcd6d..d5ae9e9dad91 100644
--- a/explorer/testdata/impl/param_impl.carbon
+++ b/explorer/testdata/impl/param_impl.carbon
@@ -11,7 +11,7 @@ package ExplorerTest api;
 
 interface Number {
   fn Zero() -> Self;
-  fn Add[me: Self](other: Self) -> Self;
+  fn Add[self: Self](other: Self) -> Self;
 }
 
 class Point(T:! Number) {
@@ -21,13 +21,13 @@ class Point(T:! Number) {
 
 external impl i32 as Number {
   fn Zero() -> i32 { return 0; }
-  fn Add[me: i32](other: i32) -> i32 { return me + other; }
+  fn Add[self: i32](other: i32) -> i32 { return self + other; }
 }
 
 external impl forall [U:! Number] Point(U) as Number {
   fn Zero() -> Point(U) { return {.x = U.Zero(), .y = U.Zero() }; }
-  fn Add[me: Point(U)](other: Point(U)) -> Point(U) {
-    return {.x = me.x.Add(other.x), .y = me.y.Add(other.y)};
+  fn Add[self: Point(U)](other: Point(U)) -> Point(U) {
+    return {.x = self.x.Add(other.x), .y = self.y.Add(other.y)};
   }
 }
 
diff --git a/explorer/testdata/impl/param_impl2.carbon b/explorer/testdata/impl/param_impl2.carbon
index 8444bc0836cf..5ec1e8e79a8a 100644
--- a/explorer/testdata/impl/param_impl2.carbon
+++ b/explorer/testdata/impl/param_impl2.carbon
@@ -11,7 +11,7 @@ package ExplorerTest api;
 
 interface Number {
   fn Zero() -> Self;
-  fn Add[me: Self](other: Self) -> Self;
+  fn Add[self: Self](other: Self) -> Self;
 }
 
 class Point(T:! Number) {
@@ -21,13 +21,13 @@ class Point(T:! Number) {
 
 external impl i32 as Number {
   fn Zero() -> i32 { return 0; }
-  fn Add[me: i32](other: i32) -> i32 { return me + other; }
+  fn Add[self: i32](other: i32) -> i32 { return self + other; }
 }
 
 external impl forall [U:! Number] Point(U) as Number {
   fn Zero() -> Point(U) { return {.x = U.Zero(), .y = U.Zero() }; }
-  fn Add[me: Point(U)](other: Point(U)) -> Point(U) {
-    return {.x = me.x.Add(other.x), .y = me.y.Add(other.y)};
+  fn Add[self: Point(U)](other: Point(U)) -> Point(U) {
+    return {.x = self.x.Add(other.x), .y = self.y.Add(other.y)};
   }
 }
 
diff --git a/explorer/testdata/impl/param_impl_with_self.carbon b/explorer/testdata/impl/param_impl_with_self.carbon
index 62804086c343..4350a5277847 100644
--- a/explorer/testdata/impl/param_impl_with_self.carbon
+++ b/explorer/testdata/impl/param_impl_with_self.carbon
@@ -11,7 +11,7 @@ package ExplorerTest api;
 
 interface Number {
   fn Zero() -> Self;
-  fn Add[me: Self](other: Self) -> Self;
+  fn Add[self: Self](other: Self) -> Self;
 }
 
 class Point(T:! Number) {
@@ -21,14 +21,14 @@ class Point(T:! Number) {
 
 external impl i32 as Number {
   fn Zero() -> i32 { return 0; }
-  fn Add[me: i32](other: i32) -> i32 { return me + other; }
+  fn Add[self: i32](other: i32) -> i32 { return self + other; }
 }
 
 external impl forall [U:! Number] Point(U) as Number {
   // Allowed: `Self` means `Point(U)` here.
   fn Zero() -> Self { return {.x = U.Zero(), .y = U.Zero() }; }
-  fn Add[me: Self](other: Self) -> Self {
-    return {.x = me.x.Add(other.x), .y = me.y.Add(other.y)};
+  fn Add[self: Self](other: Self) -> Self {
+    return {.x = self.x.Add(other.x), .y = self.y.Add(other.y)};
   }
 }
 
diff --git a/explorer/testdata/interface/addr_me.carbon b/explorer/testdata/interface/addr_self.carbon
similarity index 73%
rename from explorer/testdata/interface/addr_me.carbon
rename to explorer/testdata/interface/addr_self.carbon
index b153f2bbb3f6..d1bbe23705ec 100644
--- a/explorer/testdata/interface/addr_me.carbon
+++ b/explorer/testdata/interface/addr_self.carbon
@@ -13,8 +13,8 @@ package ExplorerTest api;
 
 interface Vector {
   fn Zero() -> Self;
-  fn Add[addr me: Self*](b: Self);
-  fn Scale[addr me: Self*](v: i32);
+  fn Add[addr self: Self*](b: Self);
+  fn Scale[addr self: Self*](v: i32);
 }
 
 class Point {
@@ -24,13 +24,13 @@ class Point {
     fn Zero() -> Self {
       return {.x = 1, .y = 1};
     }
-    fn Add[addr me: Self*](b: Self) {
-      (*me).x = (*me).x + b.x;
-      (*me).y = (*me).y + b.y;
+    fn Add[addr self: Self*](b: Self) {
+      (*self).x = (*self).x + b.x;
+      (*self).y = (*self).y + b.y;
     }
-    fn Scale[addr me: Self*](v: i32) {
-      (*me).x = (*me).x * v;
-      (*me).y = (*me).y * v;
+    fn Scale[addr self: Self*](v: i32) {
+      (*self).x = (*self).x * v;
+      (*self).y = (*self).y * v;
     }
   }
 }
diff --git a/explorer/testdata/interface/class_function.carbon b/explorer/testdata/interface/class_function.carbon
index 23f1192624f4..e101134911b7 100644
--- a/explorer/testdata/interface/class_function.carbon
+++ b/explorer/testdata/interface/class_function.carbon
@@ -11,8 +11,8 @@ package ExplorerTest api;
 
 interface Vector {
   fn Zero() -> Self;
-  fn Add[me: Self](b: Self) -> Self;
-  fn Scale[me: Self](v: i32) -> Self;
+  fn Add[self: Self](b: Self) -> Self;
+  fn Scale[self: Self](v: i32) -> Self;
 }
 
 class Point {
@@ -22,11 +22,11 @@ class Point {
     fn Zero() -> Point {
       return {.x = 0, .y = 0};
     }
-    fn Add[me: Point](b: Point) -> Point {
-      return {.x = me.x + b.x, .y = me.y + b.y};
+    fn Add[self: Point](b: Point) -> Point {
+      return {.x = self.x + b.x, .y = self.y + b.y};
     }
-    fn Scale[me: Point](v: i32) -> Point {
-      return {.x = me.x * v, .y = me.y * v};
+    fn Scale[self: Point](v: i32) -> Point {
+      return {.x = self.x * v, .y = self.y * v};
     }
   }
 }
diff --git a/explorer/testdata/interface/constrained_parameter.carbon b/explorer/testdata/interface/constrained_parameter.carbon
index 97c177365346..b821478b2844 100644
--- a/explorer/testdata/interface/constrained_parameter.carbon
+++ b/explorer/testdata/interface/constrained_parameter.carbon
@@ -10,16 +10,16 @@
 package ExplorerTest api;
 
 interface AddMul {
-  fn Add[me: Self](o: Self) -> Self;
-  fn Mul[me: Self](o: Self) -> Self;
+  fn Add[self: Self](o: Self) -> Self;
+  fn Mul[self: Self](o: Self) -> Self;
 }
 
 external impl i32 as AddMul {
-  fn Add[me: i32](o: i32) -> i32 {
-    return me + o;
+  fn Add[self: i32](o: i32) -> i32 {
+    return self + o;
   }
-  fn Mul[me: i32](o: i32) -> i32 {
-    return me * o;
+  fn Mul[self: i32](o: i32) -> i32 {
+    return self * o;
   }
 }
 
@@ -29,9 +29,9 @@ class Holder(T:! AddMul) {
 
 interface Vector(Scalar:! AddMul) {
   fn Zero() -> Self;
-  fn Add[me: Self](b: Self) -> Self;
-  fn Scale[me: Self](v: Scalar) -> Self;
-  fn Hold[me: Self](v: Scalar) -> Holder(Scalar);
+  fn Add[self: Self](b: Self) -> Self;
+  fn Scale[self: Self](v: Scalar) -> Self;
+  fn Hold[self: Self](v: Scalar) -> Holder(Scalar);
 }
 
 class Point {
@@ -41,13 +41,13 @@ class Point {
     fn Zero() -> Point {
       return {.x = 0, .y = 0};
     }
-    fn Add[me: Point](b: Point) -> Point {
-      return {.x = me.x + b.x, .y = me.y + b.y};
+    fn Add[self: Point](b: Point) -> Point {
+      return {.x = self.x + b.x, .y = self.y + b.y};
     }
-    fn Scale[me: Point](v: i32) -> Point {
-      return {.x = me.x * v, .y = me.y * v};
+    fn Scale[self: Point](v: i32) -> Point {
+      return {.x = self.x * v, .y = self.y * v};
     }
-    fn Hold[me: Point](v: i32) -> Holder(i32) {
+    fn Hold[self: Point](v: i32) -> Holder(i32) {
       return {.v = v};
     }
   }
diff --git a/explorer/testdata/interface/extends.carbon b/explorer/testdata/interface/extends.carbon
index c8eb4129a2bd..d16fc8f910b5 100644
--- a/explorer/testdata/interface/extends.carbon
+++ b/explorer/testdata/interface/extends.carbon
@@ -11,12 +11,12 @@
 package ExplorerTest api;
 
 interface Apple(T:! Type) {
-  fn F[me: Self]() -> T;
+  fn F[self: Self]() -> T;
 }
 
 interface Banana {
   extends Apple(i32);
-  fn G[me: Self]();
+  fn G[self: Self]();
 }
 
 class Carrot {
@@ -25,8 +25,8 @@ class Carrot {
 
 // This impl also provides an `impl Carrot as Apple(i32)`.
 external impl Carrot as Banana {
-  fn F[me: Self]() -> i32 { return me.n; }
-  fn G[me: Self]() { Print("Carrot.G"); }
+  fn F[self: Self]() -> i32 { return self.n; }
+  fn G[self: Self]() { Print("Carrot.G"); }
 }
 
 fn Main() -> i32 {
diff --git a/explorer/testdata/interface/external_impl_point_vector.carbon b/explorer/testdata/interface/external_impl_point_vector.carbon
index d2da1e11aadc..087b39fcaca8 100644
--- a/explorer/testdata/interface/external_impl_point_vector.carbon
+++ b/explorer/testdata/interface/external_impl_point_vector.carbon
@@ -10,8 +10,8 @@
 package ExplorerTest api;
 
 interface Vector {
-  fn Add[me: Self](b: Self) -> Self;
-  fn Scale[me: Self](v: i32) -> Self;
+  fn Add[self: Self](b: Self) -> Self;
+  fn Scale[self: Self](v: i32) -> Self;
 }
 
 class Point {
@@ -20,11 +20,11 @@ class Point {
 }
 
 external impl Point as Vector {
-  fn Add[me: Point](b: Point) -> Point {
-    return {.x = me.x + b.x, .y = me.y + b.y};
+  fn Add[self: Point](b: Point) -> Point {
+    return {.x = self.x + b.x, .y = self.y + b.y};
   }
-  fn Scale[me: Point](v: i32) -> Point {
-    return {.x = me.x * v, .y = me.y * v};
+  fn Scale[self: Point](v: i32) -> Point {
+    return {.x = self.x * v, .y = self.y * v};
   }
 }
 
diff --git a/explorer/testdata/interface/external_impl_use_self.carbon b/explorer/testdata/interface/external_impl_use_self.carbon
index 289d7337491f..376b0247362c 100644
--- a/explorer/testdata/interface/external_impl_use_self.carbon
+++ b/explorer/testdata/interface/external_impl_use_self.carbon
@@ -10,8 +10,8 @@
 package ExplorerTest api;
 
 interface Vector {
-  fn Add[me: Self](b: Self) -> Self;
-  fn Scale[me: Self](v: i32) -> Self;
+  fn Add[self: Self](b: Self) -> Self;
+  fn Scale[self: Self](v: i32) -> Self;
 }
 
 class Point {
@@ -21,11 +21,11 @@ class Point {
 
 external impl Point as Vector {
   // Allowed: `Self` means `Point` here.
-  fn Add[me: Self](b: Self) -> Self {
-    return {.x = me.x + b.x, .y = me.y + b.y};
+  fn Add[self: Self](b: Self) -> Self {
+    return {.x = self.x + b.x, .y = self.y + b.y};
   }
-  fn Scale[me: Self](v: i32) -> Self {
-    return {.x = me.x * v, .y = me.y * v};
+  fn Scale[self: Self](v: i32) -> Self {
+    return {.x = self.x * v, .y = self.y * v};
   }
 }
 
diff --git a/explorer/testdata/interface/fail_external_impl_omit_self.carbon b/explorer/testdata/interface/fail_external_impl_omit_self.carbon
index 0797320148d6..ea5873b2490d 100644
--- a/explorer/testdata/interface/fail_external_impl_omit_self.carbon
+++ b/explorer/testdata/interface/fail_external_impl_omit_self.carbon
@@ -9,8 +9,8 @@
 package ExplorerTest api;
 
 interface Vector {
-  fn Add[me: Self](b: Self) -> Self;
-  fn Scale[me: Self](v: i32) -> Self;
+  fn Add[self: Self](b: Self) -> Self;
+  fn Scale[self: Self](v: i32) -> Self;
 }
 
 class Point {
@@ -21,11 +21,11 @@ class Point {
 // Error: need to specify which type implementing `Vector` for.
 // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/interface/fail_external_impl_omit_self.carbon:[[@LINE+1]]: could not resolve 'Self'
 external impl as Vector {
-  fn Add[me: Point](b: Point) -> Point {
-    return {.x = me.x + b.x, .y = me.y + b.y};
+  fn Add[self: Point](b: Point) -> Point {
+    return {.x = self.x + b.x, .y = self.y + b.y};
   }
-  fn Scale[me: Point](v: i32) -> Point {
-    return {.x = me.x * v, .y = me.y * v};
+  fn Scale[self: Point](v: i32) -> Point {
+    return {.x = self.x * v, .y = self.y * v};
   }
 }
 
diff --git a/explorer/testdata/interface/fail_external_impl_self.carbon b/explorer/testdata/interface/fail_external_impl_self.carbon
index e06bdff68774..7cc5ce1bfbbf 100644
--- a/explorer/testdata/interface/fail_external_impl_self.carbon
+++ b/explorer/testdata/interface/fail_external_impl_self.carbon
@@ -9,8 +9,8 @@
 package ExplorerTest api;
 
 interface Vector {
-  fn Add[me: Self](b: Self) -> Self;
-  fn Scale[me: Self](v: i32) -> Self;
+  fn Add[self: Self](b: Self) -> Self;
+  fn Scale[self: Self](v: i32) -> Self;
 }
 
 class Point {
@@ -20,11 +20,11 @@ class Point {
 
 // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/interface/fail_external_impl_self.carbon:[[@LINE+1]]: could not resolve 'Self'
 external impl Self as Vector {
-  fn Add[me: Point](b: Point) -> Point {
-    return {.x = me.x + b.x, .y = me.y + b.y};
+  fn Add[self: Point](b: Point) -> Point {
+    return {.x = self.x + b.x, .y = self.y + b.y};
   }
-  fn Scale[me: Point](v: i32) -> Point {
-    return {.x = me.x * v, .y = me.y * v};
+  fn Scale[self: Point](v: i32) -> Point {
+    return {.x = self.x * v, .y = self.y * v};
   }
 }
 
diff --git a/explorer/testdata/interface/fail_impl_bad_member.carbon b/explorer/testdata/interface/fail_impl_bad_member.carbon
index ed0c5fa47e56..ea6a8aaf4bae 100644
--- a/explorer/testdata/interface/fail_impl_bad_member.carbon
+++ b/explorer/testdata/interface/fail_impl_bad_member.carbon
@@ -9,18 +9,18 @@
 package ExplorerTest api;
 
 interface Vector {
-  fn Add[me: Self](b: Self) -> Self;
-  fn Scale[me: Self](v: i32) -> Self;
+  fn Add[self: Self](b: Self) -> Self;
+  fn Scale[self: Self](v: i32) -> Self;
 }
 
 class Point {
   var x: i32;
   var y: i32;
   impl Point as Vector {
-    fn Add[me: Point](b: Point) -> Point {
-      return {.x = me.x + b.x, .y = me.y + b.y};
+    fn Add[self: Point](b: Point) -> Point {
+      return {.x = self.x + b.x, .y = self.y + b.y};
     }
-    fn Scale[me: Point](v: i32) -> i32 {
+    fn Scale[self: Point](v: i32) -> i32 {
       return 0;
     // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/interface/fail_impl_bad_member.carbon:[[@LINE+3]]: type error in member of implementation
     // CHECK:STDERR: expected: fn (i32) -> class Point
diff --git a/explorer/testdata/interface/fail_impl_missing_member.carbon b/explorer/testdata/interface/fail_impl_missing_member.carbon
index 7e843e089ba9..60b97a6d07dd 100644
--- a/explorer/testdata/interface/fail_impl_missing_member.carbon
+++ b/explorer/testdata/interface/fail_impl_missing_member.carbon
@@ -9,16 +9,16 @@
 package ExplorerTest api;
 
 interface Vector {
-  fn Add[me: Self](b: Self) -> Self;
-  fn Scale[me: Self](v: i32) -> Self;
+  fn Add[self: Self](b: Self) -> Self;
+  fn Scale[self: Self](v: i32) -> Self;
 }
 
 class Point {
   var x: i32;
   var y: i32;
   impl Point as Vector {
-    fn Add[me: Point](b: Point) -> Point {
-      return {.x = me.x + b.x, .y = me.y + b.y};
+    fn Add[self: Point](b: Point) -> Point {
+      return {.x = self.x + b.x, .y = self.y + b.y};
     }
   // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/interface/fail_impl_missing_member.carbon:[[@LINE+1]]: implementation missing Scale
   }
diff --git a/explorer/testdata/interface/fail_interface_missing_member.carbon b/explorer/testdata/interface/fail_interface_missing_member.carbon
index 4ab988c89734..e9830c6ab092 100644
--- a/explorer/testdata/interface/fail_interface_missing_member.carbon
+++ b/explorer/testdata/interface/fail_interface_missing_member.carbon
@@ -9,7 +9,7 @@
 package ExplorerTest api;
 
 interface Vector {
-  fn Add[me: Self](b: Self) -> Self;
+  fn Add[self: Self](b: Self) -> Self;
 }
 
 fn ScaleGeneric[T:! Vector](a: T, s: i32) -> T {
@@ -21,8 +21,8 @@ class Point {
   var x: i32;
   var y: i32;
   impl Point as Vector {
-    fn Add[me: Point](b: Point) -> Point {
-      return {.x = me.x + b.x, .y = me.y + b.y};
+    fn Add[self: Point](b: Point) -> Point {
+      return {.x = self.x + b.x, .y = self.y + b.y};
     }
   }
 }
diff --git a/explorer/testdata/interface/fail_no_impl.carbon b/explorer/testdata/interface/fail_no_impl.carbon
index cf53b3375fff..6ff81021ef9b 100644
--- a/explorer/testdata/interface/fail_no_impl.carbon
+++ b/explorer/testdata/interface/fail_no_impl.carbon
@@ -9,8 +9,8 @@
 package ExplorerTest api;
 
 interface Vector {
-  fn Add[me: Self](b: Self) -> Self;
-  fn Scale[me: Self](v: i32) -> Self;
+  fn Add[self: Self](b: Self) -> Self;
+  fn Scale[self: Self](v: i32) -> Self;
 }
 
 class Point {
diff --git a/explorer/testdata/interface/generic_call_generic.carbon b/explorer/testdata/interface/generic_call_generic.carbon
index 42ead9706f82..066173a5004c 100644
--- a/explorer/testdata/interface/generic_call_generic.carbon
+++ b/explorer/testdata/interface/generic_call_generic.carbon
@@ -10,19 +10,19 @@
 package ExplorerTest api;
 
 interface Vector {
-  fn Add[me: Self](b: Self) -> Self;
-  fn Scale[me: Self](v: i32) -> Self;
+  fn Add[self: Self](b: Self) -> Self;
+  fn Scale[self: Self](v: i32) -> Self;
 }
 
 class Point {
   var x: i32;
   var y: i32;
   impl Point as Vector {
-    fn Add[me: Point](b: Point) -> Point {
-      return {.x = me.x + b.x, .y = me.y + b.y};
+    fn Add[self: Point](b: Point) -> Point {
+      return {.x = self.x + b.x, .y = self.y + b.y};
     }
-    fn Scale[me: Point](v: i32) -> Point {
-      return {.x = me.x * v, .y = me.y * v};
+    fn Scale[self: Point](v: i32) -> Point {
+      return {.x = self.x * v, .y = self.y * v};
     }
   }
 }
diff --git a/explorer/testdata/interface/generic_with_two_params.carbon b/explorer/testdata/interface/generic_with_two_params.carbon
index 7348ba55e5de..8438d535e8eb 100644
--- a/explorer/testdata/interface/generic_with_two_params.carbon
+++ b/explorer/testdata/interface/generic_with_two_params.carbon
@@ -10,19 +10,19 @@
 package ExplorerTest api;
 
 interface Vector {
-  fn Add[me: Self](b: Self) -> Self;
-  fn Scale[me: Self](v: i32) -> Self;
+  fn Add[self: Self](b: Self) -> Self;
+  fn Scale[self: Self](v: i32) -> Self;
 }
 
 class Point1 {
   var x: i32;
   var y: i32;
   impl Point1 as Vector {
-    fn Add[me: Point1](b: Point1) -> Point1 {
-      return {.x = me.x + b.x, .y = me.y + b.y};
+    fn Add[self: Point1](b: Point1) -> Point1 {
+      return {.x = self.x + b.x, .y = self.y + b.y};
     }
-    fn Scale[me: Point1](v: i32) -> Point1 {
-      return {.x = me.x * v, .y = me.y * v};
+    fn Scale[self: Point1](v: i32) -> Point1 {
+      return {.x = self.x * v, .y = self.y * v};
     }
   }
 }
@@ -31,11 +31,11 @@ class Point2 {
   var x: i32;
   var y: i32;
   impl Point2 as Vector {
-    fn Add[me: Point2](b: Point2) -> Point2 {
-      return {.x = me.x + b.x + 1, .y = me.y + b.y + 1};
+    fn Add[self: Point2](b: Point2) -> Point2 {
+      return {.x = self.x + b.x + 1, .y = self.y + b.y + 1};
     }
-    fn Scale[me: Point2](v: i32) -> Point2 {
-      return {.x = me.x * v * 2, .y = me.y * v * 2};
+    fn Scale[self: Point2](v: i32) -> Point2 {
+      return {.x = self.x * v * 2, .y = self.y * v * 2};
     }
   }
 }
diff --git a/explorer/testdata/interface/impl_as.carbon b/explorer/testdata/interface/impl_as.carbon
index 781a1e133695..65e225bbb9e6 100644
--- a/explorer/testdata/interface/impl_as.carbon
+++ b/explorer/testdata/interface/impl_as.carbon
@@ -11,12 +11,12 @@
 package ExplorerTest api;
 
 interface Apple(T:! Type) {
-  fn F[me: Self]() -> T;
+  fn F[self: Self]() -> T;
 }
 
 interface Banana {
   impl as Apple(i32);
-  fn G[me: Self]();
+  fn G[self: Self]();
 }
 
 class Carrot {
@@ -24,11 +24,11 @@ class Carrot {
 }
 
 external impl Carrot as Apple(i32) {
-  fn F[me: Self]() -> i32 { return me.n; }
+  fn F[self: Self]() -> i32 { return self.n; }
 }
 
 external impl Carrot as Banana {
-  fn G[me: Self]() { Print("Carrot.G"); }
+  fn G[self: Self]() { Print("Carrot.G"); }
 }
 
 fn H[T:! Banana](x: T) -> i32 {
diff --git a/explorer/testdata/interface/impl_as_not_self.carbon b/explorer/testdata/interface/impl_as_not_self.carbon
index d1c97506b589..df823c98dc95 100644
--- a/explorer/testdata/interface/impl_as_not_self.carbon
+++ b/explorer/testdata/interface/impl_as_not_self.carbon
@@ -21,7 +21,7 @@ class IntHolder {
   var n: i32;
 }
 external impl i32 as ImplicitAs(IntHolder) {
-  fn Convert[me: Self]() -> IntHolder { return {.n = me}; }
+  fn Convert[self: Self]() -> IntHolder { return {.n = self}; }
 }
 external impl IntHolder as ConvertsFromInt {}
 
diff --git a/explorer/testdata/interface/impl_self_interface_parameter.carbon b/explorer/testdata/interface/impl_self_interface_parameter.carbon
index 4693808a4a85..a4eb1eb5c226 100644
--- a/explorer/testdata/interface/impl_self_interface_parameter.carbon
+++ b/explorer/testdata/interface/impl_self_interface_parameter.carbon
@@ -10,7 +10,7 @@
 package ExplorerTest api;
 
 interface MyAddWith(T:! Type) {
-  fn Op[me: Self](b: T) -> Self;
+  fn Op[self: Self](b: T) -> Self;
 }
 
 class Point {
@@ -20,8 +20,8 @@ class Point {
 
 // Allowed: `Self` means `Point` after `as`
 impl Point as MyAddWith(Self) {
-  fn Op[me: Point](b: Point) -> Point {
-    return {.x = me.x + b.x, .y = me.y + b.y};
+  fn Op[self: Point](b: Point) -> Point {
+    return {.x = self.x + b.x, .y = self.y + b.y};
   }
 }
 
diff --git a/explorer/testdata/interface/omit_self.carbon b/explorer/testdata/interface/omit_self.carbon
index 68b643178536..b2c10f2d9aec 100644
--- a/explorer/testdata/interface/omit_self.carbon
+++ b/explorer/testdata/interface/omit_self.carbon
@@ -11,8 +11,8 @@ package ExplorerTest api;
 
 interface Vector {
   fn Zero() -> Self;
-  fn Add[me: Self](b: Self) -> Self;
-  fn Scale[me: Self](v: i32) -> Self;
+  fn Add[self: Self](b: Self) -> Self;
+  fn Scale[self: Self](v: i32) -> Self;
 }
 
 class Point {
@@ -24,11 +24,11 @@ class Point {
     fn Zero() -> Point {
       return {.x = 0, .y = 0};
     }
-    fn Add[me: Point](b: Point) -> Point {
-      return {.x = me.x + b.x, .y = me.y + b.y};
+    fn Add[self: Point](b: Point) -> Point {
+      return {.x = self.x + b.x, .y = self.y + b.y};
     }
-    fn Scale[me: Point](v: i32) -> Point {
-      return {.x = me.x * v, .y = me.y * v};
+    fn Scale[self: Point](v: i32) -> Point {
+      return {.x = self.x * v, .y = self.y * v};
     }
   }
 }
diff --git a/explorer/testdata/interface/param_with_dependent_type.carbon b/explorer/testdata/interface/param_with_dependent_type.carbon
index a4cc57034ee6..0c6be3b890a9 100644
--- a/explorer/testdata/interface/param_with_dependent_type.carbon
+++ b/explorer/testdata/interface/param_with_dependent_type.carbon
@@ -10,11 +10,11 @@
 package ExplorerTest api;
 
 interface HasValueParam(T:! Type, V:! T) {
-  fn Go[me: Self]() -> T;
+  fn Go[self: Self]() -> T;
 }
 
 impl () as HasValueParam(i32, 5) {
-  fn Go[me: Self]() -> i32 { return 42; }
+  fn Go[self: Self]() -> i32 { return 42; }
 }
 
 fn Main() -> i32 {
diff --git a/explorer/testdata/interface/parameterized.carbon b/explorer/testdata/interface/parameterized.carbon
index 10aadcc4f5e2..fbcb8c457642 100644
--- a/explorer/testdata/interface/parameterized.carbon
+++ b/explorer/testdata/interface/parameterized.carbon
@@ -11,8 +11,8 @@ package ExplorerTest api;
 
 interface Vector(Scalar:! Type) {
   fn Zero() -> Self;
-  fn Add[me: Self](b: Self) -> Self;
-  fn Scale[me: Self](v: Scalar) -> Self;
+  fn Add[self: Self](b: Self) -> Self;
+  fn Scale[self: Self](v: Scalar) -> Self;
 }
 
 class Point {
@@ -22,11 +22,11 @@ class Point {
     fn Zero() -> Point {
       return {.x = 0, .y = 0};
     }
-    fn Add[me: Point](b: Point) -> Point {
-      return {.x = me.x + b.x, .y = me.y + b.y};
+    fn Add[self: Point](b: Point) -> Point {
+      return {.x = self.x + b.x, .y = self.y + b.y};
     }
-    fn Scale[me: Point](v: i32) -> Point {
-      return {.x = me.x * v, .y = me.y * v};
+    fn Scale[self: Point](v: i32) -> Point {
+      return {.x = self.x * v, .y = self.y * v};
     }
   }
 }
diff --git a/explorer/testdata/interface/tuple_vector_add_scale.carbon b/explorer/testdata/interface/tuple_vector_add_scale.carbon
index f2e87211d334..338527f72c5b 100644
--- a/explorer/testdata/interface/tuple_vector_add_scale.carbon
+++ b/explorer/testdata/interface/tuple_vector_add_scale.carbon
@@ -10,19 +10,19 @@
 package ExplorerTest api;
 
 interface Vector {
-  fn Add[me: Self](b: Self) -> Self;
-  fn Scale[me: Self](v: i32) -> Self;
+  fn Add[self: Self](b: Self) -> Self;
+  fn Scale[self: Self](v: i32) -> Self;
 }
 
 class Point {
   var x: i32;
   var y: i32;
   impl Point as Vector {
-    fn Add[me: Point](b: Point) -> Point {
-      return {.x = me.x + b.x, .y = me.y + b.y};
+    fn Add[self: Point](b: Point) -> Point {
+      return {.x = self.x + b.x, .y = self.y + b.y};
     }
-    fn Scale[me: Point](v: i32) -> Point {
-      return {.x = me.x * v, .y = me.y * v};
+    fn Scale[self: Point](v: i32) -> Point {
+      return {.x = self.x * v, .y = self.y * v};
     }
   }
 }
diff --git a/explorer/testdata/interface/vector_point_add_scale.carbon b/explorer/testdata/interface/vector_point_add_scale.carbon
index 3b6f48fd1bed..9f1e34c0e47b 100644
--- a/explorer/testdata/interface/vector_point_add_scale.carbon
+++ b/explorer/testdata/interface/vector_point_add_scale.carbon
@@ -10,19 +10,19 @@
 package ExplorerTest api;
 
 interface Vector {
-  fn Add[me: Self](b: Self) -> Self;
-  fn Scale[me: Self](v: i32) -> Self;
+  fn Add[self: Self](b: Self) -> Self;
+  fn Scale[self: Self](v: i32) -> Self;
 }
 
 class Point {
   var x: i32;
   var y: i32;
   impl Point as Vector {
-    fn Add[me: Point](b: Point) -> Point {
-      return {.x = me.x + b.x, .y = me.y + b.y};
+    fn Add[self: Point](b: Point) -> Point {
+      return {.x = self.x + b.x, .y = self.y + b.y};
     }
-    fn Scale[me: Point](v: i32) -> Point {
-      return {.x = me.x * v, .y = me.y * v};
+    fn Scale[self: Point](v: i32) -> Point {
+      return {.x = self.x * v, .y = self.y * v};
     }
   }
 }
diff --git a/explorer/testdata/interface/with_self.carbon b/explorer/testdata/interface/with_self.carbon
index 56331c6855fc..27da07f57f9d 100644
--- a/explorer/testdata/interface/with_self.carbon
+++ b/explorer/testdata/interface/with_self.carbon
@@ -11,8 +11,8 @@ package ExplorerTest api;
 
 interface Vector {
   fn Zero() -> Self;
-  fn Add[me: Self](b: Self) -> Self;
-  fn Scale[me: Self](v: i32) -> Self;
+  fn Add[self: Self](b: Self) -> Self;
+  fn Scale[self: Self](v: i32) -> Self;
 }
 
 class Point {
@@ -23,11 +23,11 @@ class Point {
     fn Zero() -> Self {
       return {.x = 0, .y = 0};
     }
-    fn Add[me: Self](b: Self) -> Self {
-      return {.x = me.x + b.x, .y = me.y + b.y};
+    fn Add[self: Self](b: Self) -> Self {
+      return {.x = self.x + b.x, .y = self.y + b.y};
     }
-    fn Scale[me: Self](v: i32) -> Self {
-      return {.x = me.x * v, .y = me.y * v};
+    fn Scale[self: Self](v: i32) -> Self {
+      return {.x = self.x * v, .y = self.y * v};
     }
   }
 }
diff --git a/explorer/testdata/let/fail_method_args.carbon b/explorer/testdata/let/fail_method_args.carbon
index 8afed02c3e80..d446a3b231ed 100644
--- a/explorer/testdata/let/fail_method_args.carbon
+++ b/explorer/testdata/let/fail_method_args.carbon
@@ -13,7 +13,7 @@ class Point {
     return {.x = 0, .y = 0};
   }
 
-  fn SetX[me: Point](x: i32) {
+  fn SetX[self: Point](x: i32) {
     // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/let/fail_method_args.carbon:[[@LINE+1]]: Cannot assign to rvalue 'x'
     x = 10;
   }
diff --git a/explorer/testdata/let/implicit_conversion.carbon b/explorer/testdata/let/implicit_conversion.carbon
index 66530763e0ef..9906fc993878 100644
--- a/explorer/testdata/let/implicit_conversion.carbon
+++ b/explorer/testdata/let/implicit_conversion.carbon
@@ -11,7 +11,7 @@ package ExplorerTest api;
 
 class A {
   impl as ImplicitAs(i32) {
-    fn Convert[me: Self]() -> i32 { return me.n; }
+    fn Convert[self: Self]() -> i32 { return self.n; }
   }
   var n: i32;
 }
diff --git a/explorer/testdata/let/implicit_conversion_choice.carbon b/explorer/testdata/let/implicit_conversion_choice.carbon
index 1f902a4e7da1..5af6590b9729 100644
--- a/explorer/testdata/let/implicit_conversion_choice.carbon
+++ b/explorer/testdata/let/implicit_conversion_choice.carbon
@@ -14,7 +14,7 @@ choice A {
 }
 
 impl i32 as ImplicitAs(A) {
-  fn Convert[me: Self]() -> A { return A.Value(me + 1); }
+  fn Convert[self: Self]() -> A { return A.Value(self + 1); }
 }
 
 fn Main() -> i32 {
diff --git a/explorer/testdata/linked_list/linked_list.carbon b/explorer/testdata/linked_list/linked_list.carbon
index 4f67ad66bf6b..fe157c22b21b 100644
--- a/explorer/testdata/linked_list/linked_list.carbon
+++ b/explorer/testdata/linked_list/linked_list.carbon
@@ -25,8 +25,8 @@ class ListElement{
     };
   }
 
-  fn set[addr me: Self*] (value: Optional(ListElement*)){
-    (*me).next = value;
+  fn set[addr self: Self*] (value: Optional(ListElement*)){
+    (*self).next = value;
   }
 
   var element: Optional(i32);
@@ -37,12 +37,12 @@ class List{
   fn Create() -> List{
     return {.next = Optional(ListElement*).CreateEmpty() };
   }
-  fn insert[addr me: Self*] (value: i32){
-    if( not (*me).next.HasValue() ){
-      (*me).next = Optional(ListElement*).Create( heap.New(ListElement.Create(value)) );
+  fn insert[addr self: Self*] (value: i32){
+    if( not (*self).next.HasValue() ){
+      (*self).next = Optional(ListElement*).Create( heap.New(ListElement.Create(value)) );
       return;
     }
-    var iter: Optional(ListElement*) = (*me).next;
+    var iter: Optional(ListElement*) = (*self).next;
     var node: auto = (iter.Get());
     while((*node).next.HasValue()){
       iter = (*node).next;
@@ -53,8 +53,8 @@ class List{
     (*v).set(x);
   }
 
-  fn print[me: Self] (){
-    var iter: Optional(ListElement*) = me.next;
+  fn print[self: Self] (){
+    var iter: Optional(ListElement*) = self.next;
     while(iter.HasValue()){
       var node: auto = *(iter.Get());
       Print("{0}",node.element.Get());
@@ -63,14 +63,14 @@ class List{
     }
   }
 
-  fn clean[addr me: Self*] (){
-    var head: auto = (*me).next;
+  fn clean[addr self: Self*] (){
+    var head: auto = (*self).next;
     while(head.HasValue()){
       var tmp: auto = head;
       head = (*head.Get()).next;
       heap.Delete(tmp.Get());
     }
-    (*me).next= Optional(ListElement*).CreateEmpty();
+    (*self).next= Optional(ListElement*).CreateEmpty();
   }
 
   var next: Optional(ListElement*);
diff --git a/explorer/testdata/linked_list/typed_linked_list.carbon b/explorer/testdata/linked_list/typed_linked_list.carbon
index a757f4616c83..8f4419297751 100644
--- a/explorer/testdata/linked_list/typed_linked_list.carbon
+++ b/explorer/testdata/linked_list/typed_linked_list.carbon
@@ -19,11 +19,11 @@ class Node(T:! Type) {
       .prev = Optional(Node(T)*).CreateEmpty()
     };
   }
-  fn set_next[addr me:Self*](n: Optional(Node(T)*)) {
-    (*me).next = n;
+  fn set_next[addr self: Self*](n: Optional(Node(T)*)) {
+    (*self).next = n;
   }
-  fn set_prev[addr me:Self*](n: Optional(Node(T)*)) {
-    (*me).prev = n;
+  fn set_prev[addr self: Self*](n: Optional(Node(T)*)) {
+    (*self).prev = n;
   }
   var value: Optional(T);
   var next: Optional(Node(T)*);
@@ -38,50 +38,50 @@ class LinkedList(T:! Type) {
       .len = 0
     };
   }
-  fn PushBack[addr me: Self*](value:T) {
-    (*me).len = (*me).len + 1;
-    if(not (*me).head.HasValue()) {
-      (*me).head = Optional(Node(T)*).Create(heap.New(Node(T).Create(value)));
-      (*me).tail = (*me).head;
+  fn PushBack[addr self: Self*](value:T) {
+    (*self).len = (*self).len + 1;
+    if(not (*self).head.HasValue()) {
+      (*self).head = Optional(Node(T)*).Create(heap.New(Node(T).Create(value)));
+      (*self).tail = (*self).head;
       return;
     }
-    var last: Optional(Node(T)*) = (*me).tail;
+    var last: Optional(Node(T)*) = (*self).tail;
     var last_value:Node(T)* = last.Get();
     var v_wrapped:Optional(Node(T)*) = Optional(Node(T)*).Create(heap.New(Node(T).Create(value)));
     (*last_value).set_next(v_wrapped);
     (*v_wrapped.Get()).set_prev(last);
-    (*me).tail = v_wrapped;
+    (*self).tail = v_wrapped;
   }
-  fn PushFront[addr me: Self*](value:T) {
-    (*me).len = (*me).len + 1;
-    if(not (*me).head.HasValue()) {
-      (*me).head = Optional(Node(T)*).Create(heap.New(Node(T).Create(value)));
-      (*me).tail = (*me).head;
+  fn PushFront[addr self: Self*](value:T) {
+    (*self).len = (*self).len + 1;
+    if(not (*self).head.HasValue()) {
+      (*self).head = Optional(Node(T)*).Create(heap.New(Node(T).Create(value)));
+      (*self).tail = (*self).head;
       return;
     }
     var v_wrapped:Optional(Node(T)*) = Optional(Node(T)*).Create(heap.New(Node(T).Create(value)));
-    var current_head: Optional(Node(T)*) = (*me).head;
+    var current_head: Optional(Node(T)*) = (*self).head;
     var current_head_value: Node(T)* = current_head.Get();
     (*v_wrapped.Get()).set_next(current_head);
     (*current_head_value).set_prev(v_wrapped);
-    (*me).head = v_wrapped;
+    (*self).head = v_wrapped;
   }
-  fn Clear[addr me: Self*]() {
-    if((*me).len == 0) {
+  fn Clear[addr self: Self*]() {
+    if((*self).len == 0) {
       return;
     }
-    var iter: auto = (*me).head;
+    var iter: auto = (*self).head;
     while(iter.HasValue()) {
       var current: auto = iter;
       iter = (*iter.Get()).next;
       heap.Delete(current.Get());
     }
-    (*me).head = Optional(Node(T)*).CreateEmpty();
-    (*me).tail = Optional(Node(T)*).CreateEmpty();
-    (*me).len = 0;
+    (*self).head = Optional(Node(T)*).CreateEmpty();
+    (*self).tail = Optional(Node(T)*).CreateEmpty();
+    (*self).len = 0;
   }
-  fn Length[me:Self]() -> i32 {
-    return me.len;
+  fn Length[self: Self]() -> i32 {
+    return self.len;
   }
   var head: Optional(Node(T)*);
   var tail: Optional(Node(T)*);
diff --git a/explorer/testdata/match/convert.carbon b/explorer/testdata/match/convert.carbon
index 02a64896defe..a280ee75dde0 100644
--- a/explorer/testdata/match/convert.carbon
+++ b/explorer/testdata/match/convert.carbon
@@ -11,7 +11,7 @@ package ExplorerTest api;
 
 class A {}
 impl A as ImplicitAs(i32) {
-  fn Convert[me: Self]() -> i32 { return 1; }
+  fn Convert[self: Self]() -> i32 { return 1; }
 }
 
 fn Main() -> i32 {
diff --git a/explorer/testdata/match/fail_pattern_type_mismatch.carbon b/explorer/testdata/match/fail_pattern_type_mismatch.carbon
index 8fdfa3938b48..7c6d3db54533 100644
--- a/explorer/testdata/match/fail_pattern_type_mismatch.carbon
+++ b/explorer/testdata/match/fail_pattern_type_mismatch.carbon
@@ -10,7 +10,7 @@ package ExplorerTest api;
 
 class A {}
 impl A as ImplicitAs(i32) {
-  fn Convert[me: Self]() -> i32 { return 1; }
+  fn Convert[self: Self]() -> i32 { return 1; }
 }
 
 fn Main() -> i32 {
diff --git a/explorer/testdata/member_access/convert_lhs_class.carbon b/explorer/testdata/member_access/convert_lhs_class.carbon
index 0115bf8541c9..f88459bcd106 100644
--- a/explorer/testdata/member_access/convert_lhs_class.carbon
+++ b/explorer/testdata/member_access/convert_lhs_class.carbon
@@ -10,14 +10,14 @@
 package Foo api;
 
 class X {
-  fn F[me: Self](o: Self) -> Self { return {.n = me.n + o.n}; }
+  fn F[self: Self](o: Self) -> Self { return {.n = self.n + o.n}; }
   var n: i32;
 }
 
 class Y {
   var m: i32;
   impl as ImplicitAs(X) {
-    fn Convert[me: Self]() -> X { return {.n = me.m}; }
+    fn Convert[self: Self]() -> X { return {.n = self.m}; }
   }
 }
 
diff --git a/explorer/testdata/member_access/convert_lhs_interface.carbon b/explorer/testdata/member_access/convert_lhs_interface.carbon
index 19ba30ff648b..13d3b0f060f0 100644
--- a/explorer/testdata/member_access/convert_lhs_interface.carbon
+++ b/explorer/testdata/member_access/convert_lhs_interface.carbon
@@ -10,12 +10,12 @@
 package Foo api;
 
 interface HasF {
-  fn F[me: Self](o: Self) -> Self;
+  fn F[self: Self](o: Self) -> Self;
 }
 
 class X {
   impl as HasF {
-    fn F[me: Self](o: Self) -> Self { return {.n = me.n + o.n}; }
+    fn F[self: Self](o: Self) -> Self { return {.n = self.n + o.n}; }
   }
   var n: i32;
 }
@@ -23,7 +23,7 @@ class X {
 class Y {
   var m: i32;
   impl as ImplicitAs(X) {
-    fn Convert[me: Self]() -> X { return {.n = me.m}; }
+    fn Convert[self: Self]() -> X { return {.n = self.m}; }
   }
 }
 
diff --git a/explorer/testdata/member_access/evaluate_type_before_dot.carbon b/explorer/testdata/member_access/evaluate_type_before_dot.carbon
index c7769c4eb93f..71399162a203 100644
--- a/explorer/testdata/member_access/evaluate_type_before_dot.carbon
+++ b/explorer/testdata/member_access/evaluate_type_before_dot.carbon
@@ -16,10 +16,10 @@ package Foo api;
 
 choice Choice { Alternative() }
 class Class { fn F(n: i32) -> i32 { return n + 1; } }
-interface Interface { fn G[me: Self]() -> Self; }
+interface Interface { fn G[self: Self]() -> Self; }
 interface AnotherInterface {}
 
-impl i32 as Interface { fn G[me: i32]() -> i32 { return me + 1; } }
+impl i32 as Interface { fn G[self: i32]() -> i32 { return self + 1; } }
 impl i32 as AnotherInterface {}
 
 // TODO: These are intended to be called at compile time. Mark them as
diff --git a/explorer/testdata/member_access/fail_qualified_non_member.carbon b/explorer/testdata/member_access/fail_qualified_non_member.carbon
index e68c4324be4f..4c5b13ad2410 100644
--- a/explorer/testdata/member_access/fail_qualified_non_member.carbon
+++ b/explorer/testdata/member_access/fail_qualified_non_member.carbon
@@ -7,7 +7,7 @@
 // RUN: %{not} %{explorer-run-trace}
 
 package Foo api;
-fn F[me: i32]() {}
+fn F[self: i32]() {}
 fn Main() -> i32 {
   // TODO: It's unclear whether this is valid per the current rules. See
   // https://github.com/carbon-language/carbon-lang/pull/1122
diff --git a/explorer/testdata/member_access/nearly_vacuous_access_with_instance_binding.carbon b/explorer/testdata/member_access/nearly_vacuous_access_with_instance_binding.carbon
index d852d4a805d4..edf6130e8662 100644
--- a/explorer/testdata/member_access/nearly_vacuous_access_with_instance_binding.carbon
+++ b/explorer/testdata/member_access/nearly_vacuous_access_with_instance_binding.carbon
@@ -8,10 +8,10 @@
 // CHECK:STDOUT: result: 1
 
 package Foo api;
-interface A { fn F[me: Self]() -> i32; }
+interface A { fn F[self: Self]() -> i32; }
 class X {
   impl as A {
-    fn F[me: Self]() -> i32 { return 1; }
+    fn F[self: Self]() -> i32 { return 1; }
   }
 }
 fn Main() -> i32 {
diff --git a/explorer/testdata/member_access/param_qualified_interface_member.carbon b/explorer/testdata/member_access/param_qualified_interface_member.carbon
index 211fdcfadf11..2dc9fb5a6a1a 100644
--- a/explorer/testdata/member_access/param_qualified_interface_member.carbon
+++ b/explorer/testdata/member_access/param_qualified_interface_member.carbon
@@ -9,11 +9,11 @@
 
 package Foo api;
 interface A {
-  fn F[me: Self](o: Self) -> Self;
+  fn F[self: Self](o: Self) -> Self;
 }
 class X {
   impl as A {
-    fn F[me: Self](o: Self) -> Self { return {.n = me.n + o.n}; }
+    fn F[self: Self](o: Self) -> Self { return {.n = self.n + o.n}; }
   }
   var n: i32;
 }
diff --git a/explorer/testdata/member_access/qualified_class_member.carbon b/explorer/testdata/member_access/qualified_class_member.carbon
index f892b169b7ca..37173ceb3664 100644
--- a/explorer/testdata/member_access/qualified_class_member.carbon
+++ b/explorer/testdata/member_access/qualified_class_member.carbon
@@ -9,7 +9,7 @@
 
 package Foo api;
 class X {
-  fn F[me: Self](o: Self) -> Self { return {.n = me.n + o.n}; }
+  fn F[self: Self](o: Self) -> Self { return {.n = self.n + o.n}; }
   var n: i32;
 }
 fn Main() -> i32 {
diff --git a/explorer/testdata/member_access/qualified_constraint_member.carbon b/explorer/testdata/member_access/qualified_constraint_member.carbon
index 86eaf95d485a..be671cdddd07 100644
--- a/explorer/testdata/member_access/qualified_constraint_member.carbon
+++ b/explorer/testdata/member_access/qualified_constraint_member.carbon
@@ -9,7 +9,7 @@
 
 package Foo api;
 interface A {
-  fn F[me: Self]() -> i32;
+  fn F[self: Self]() -> i32;
 }
 interface B {
   fn G(o: Self) -> i32;
@@ -17,7 +17,7 @@ interface B {
 alias C = A & B;
 class X {
   impl as A {
-    fn F[me: Self]() -> i32 { return 10 * me.n; }
+    fn F[self: Self]() -> i32 { return 10 * self.n; }
   }
   impl as B {
     fn G(o: Self) -> i32 { return o.n; }
diff --git a/explorer/testdata/member_access/qualified_interface_member.carbon b/explorer/testdata/member_access/qualified_interface_member.carbon
index 969a47d884c7..6975b3b87585 100644
--- a/explorer/testdata/member_access/qualified_interface_member.carbon
+++ b/explorer/testdata/member_access/qualified_interface_member.carbon
@@ -9,11 +9,11 @@
 
 package Foo api;
 interface A {
-  fn F[me: Self](o: Self) -> Self;
+  fn F[self: Self](o: Self) -> Self;
 }
 class X {
   impl as A {
-    fn F[me: Self](o: Self) -> Self { return {.n = me.n + o.n}; }
+    fn F[self: Self](o: Self) -> Self { return {.n = self.n + o.n}; }
   }
   var n: i32;
 }
diff --git a/explorer/testdata/member_access/qualified_param_member.carbon b/explorer/testdata/member_access/qualified_param_member.carbon
index a9d9ee0e1459..cafdfb43444d 100644
--- a/explorer/testdata/member_access/qualified_param_member.carbon
+++ b/explorer/testdata/member_access/qualified_param_member.carbon
@@ -9,11 +9,11 @@
 
 package Foo api;
 interface A {
-  fn F[me: Self](o: Self) -> Self;
+  fn F[self: Self](o: Self) -> Self;
 }
 class X {
   impl as A {
-    fn F[me: Self](o: Self) -> Self { return {.n = me.n + o.n}; }
+    fn F[self: Self](o: Self) -> Self { return {.n = self.n + o.n}; }
   }
   var n: i32;
 }
diff --git a/explorer/testdata/mixin/fail_circular_mixing.carbon b/explorer/testdata/mixin/fail_circular_mixing.carbon
index 24d3f813fef0..615e63a7d065 100644
--- a/explorer/testdata/mixin/fail_circular_mixing.carbon
+++ b/explorer/testdata/mixin/fail_circular_mixing.carbon
@@ -8,7 +8,7 @@
 package ExplorerTest api;
 
 __mixin M1 {
-  fn F1[me: Self](x: Self) -> Self{
+  fn F1[self: Self](x: Self) -> Self{
      return x;
   }
   // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/mixin/fail_circular_mixing.carbon:[[@LINE+1]]: 'M3' has not been declared yet
diff --git a/explorer/testdata/mixin/fail_field_member_name_clash.carbon b/explorer/testdata/mixin/fail_field_member_name_clash.carbon
index 77beaece9f38..738e606bc225 100644
--- a/explorer/testdata/mixin/fail_field_member_name_clash.carbon
+++ b/explorer/testdata/mixin/fail_field_member_name_clash.carbon
@@ -9,7 +9,7 @@
 package ExplorerTest api;
 
 __mixin M {
-  fn F[me: Self](x: Self) -> Self{
+  fn F[self: Self](x: Self) -> Self{
      return x;
   }
 }
diff --git a/explorer/testdata/mixin/fail_method_member_name_clash.carbon b/explorer/testdata/mixin/fail_method_member_name_clash.carbon
index 5692a64e104f..6bc581839b1e 100644
--- a/explorer/testdata/mixin/fail_method_member_name_clash.carbon
+++ b/explorer/testdata/mixin/fail_method_member_name_clash.carbon
@@ -9,13 +9,13 @@
 package ExplorerTest api;
 
 __mixin M {
-  fn F[me: Self](x: Self) -> Self{
+  fn F[self: Self](x: Self) -> Self{
      return x;
   }
 }
 
 class C {
-  fn F[me: Self](x: Self) -> Self {
+  fn F[self: Self](x: Self) -> Self {
      return x;
   }
   __mix M;
diff --git a/explorer/testdata/mixin/fail_mix_diamond_clash.carbon b/explorer/testdata/mixin/fail_mix_diamond_clash.carbon
index 275346346e1a..72a4273d20ef 100644
--- a/explorer/testdata/mixin/fail_mix_diamond_clash.carbon
+++ b/explorer/testdata/mixin/fail_mix_diamond_clash.carbon
@@ -8,7 +8,7 @@
 package ExplorerTest api;
 
 __mixin M1 {
-  fn F1[me: Self](x: Self) -> Self{
+  fn F1[self: Self](x: Self) -> Self{
      return x;
   }
 }
diff --git a/explorer/testdata/mixin/fail_mix_in_global.carbon b/explorer/testdata/mixin/fail_mix_in_global.carbon
index 9432a5953bbf..553896582a16 100644
--- a/explorer/testdata/mixin/fail_mix_in_global.carbon
+++ b/explorer/testdata/mixin/fail_mix_in_global.carbon
@@ -9,7 +9,7 @@
 package ExplorerTest api;
 
 __mixin Operations {
-  fn Square[me: Self](x:i32) -> i32{
+  fn Square[self: Self](x:i32) -> i32{
     return x * x;
   }
 }
diff --git a/explorer/testdata/mixin/fail_mix_in_impl.carbon b/explorer/testdata/mixin/fail_mix_in_impl.carbon
index cb1127c2b81c..ef988bc48c74 100644
--- a/explorer/testdata/mixin/fail_mix_in_impl.carbon
+++ b/explorer/testdata/mixin/fail_mix_in_impl.carbon
@@ -9,7 +9,7 @@
 package ExplorerTest api;
 
 __mixin Operations {
-  fn Square[me: Self](x:i32) -> i32{
+  fn Square[self: Self](x:i32) -> i32{
     return x * x;
   }
 }
diff --git a/explorer/testdata/mixin/fail_mix_members_clash.carbon b/explorer/testdata/mixin/fail_mix_members_clash.carbon
index 1f97215a9ada..97618a9590c3 100644
--- a/explorer/testdata/mixin/fail_mix_members_clash.carbon
+++ b/explorer/testdata/mixin/fail_mix_members_clash.carbon
@@ -8,7 +8,7 @@
 package ExplorerTest api;
 
 __mixin M1 {
-  fn F1[me: Self](x: Self) -> Self{
+  fn F1[self: Self](x: Self) -> Self{
      return x;
   }
 }
diff --git a/explorer/testdata/mixin/fail_recursive_mixing.carbon b/explorer/testdata/mixin/fail_recursive_mixing.carbon
index eb072593e743..cbd240ade478 100644
--- a/explorer/testdata/mixin/fail_recursive_mixing.carbon
+++ b/explorer/testdata/mixin/fail_recursive_mixing.carbon
@@ -8,7 +8,7 @@
 package ExplorerTest api;
 
 __mixin M1 {
-  fn F1[me: Self](x: Self) -> Self{
+  fn F1[self: Self](x: Self) -> Self{
      return x;
   }
   // CHECK:STDERR: COMPILATION ERROR: {{.*}}/explorer/testdata/mixin/fail_recursive_mixing.carbon:[[@LINE+1]]: incomplete mixin `M1` used in mix declaration
diff --git a/explorer/testdata/mixin/fail_self_substitution.carbon b/explorer/testdata/mixin/fail_self_substitution.carbon
index 24100a871bdf..27af0f21e7bc 100644
--- a/explorer/testdata/mixin/fail_self_substitution.carbon
+++ b/explorer/testdata/mixin/fail_self_substitution.carbon
@@ -9,7 +9,7 @@
 package ExplorerTest api;
 
 __mixin Operations {
-  fn F[me: Self](x: Self) -> Self{
+  fn F[self: Self](x: Self) -> Self{
      return x;
   }
 }
diff --git a/explorer/testdata/mixin/self_substitution.carbon b/explorer/testdata/mixin/self_substitution.carbon
index e80b4e3a9035..d406b129e67e 100644
--- a/explorer/testdata/mixin/self_substitution.carbon
+++ b/explorer/testdata/mixin/self_substitution.carbon
@@ -11,7 +11,7 @@ package ExplorerTest api;
 
 __mixin Operations {
   // Here Self which is both the input and output type is a type variable
-  fn F[me: Self](x: Self) -> Self {
+  fn F[self: Self](x: Self) -> Self {
      return x;
   }
 }
diff --git a/explorer/testdata/mixin/simple_mix_in_mixin.carbon b/explorer/testdata/mixin/simple_mix_in_mixin.carbon
index 6b2126fa649e..5df69ce369e3 100644
--- a/explorer/testdata/mixin/simple_mix_in_mixin.carbon
+++ b/explorer/testdata/mixin/simple_mix_in_mixin.carbon
@@ -10,14 +10,14 @@
 package ExplorerTest api;
 
 __mixin M1 {
-  fn Scale10[me:Self](x:i32) -> i32{
+  fn Scale10[self: Self](x:i32) -> i32{
      return x * 10;
   }
 }
 
 __mixin M2 {
   __mix M1;
-  fn Square[me: Self](x:i32) -> i32{
+  fn Square[self: Self](x:i32) -> i32{
     return x * x;
   }
 }
diff --git a/explorer/testdata/mixin/simple_reuse.carbon b/explorer/testdata/mixin/simple_reuse.carbon
index cf2e981214a2..fec4278b592f 100644
--- a/explorer/testdata/mixin/simple_reuse.carbon
+++ b/explorer/testdata/mixin/simple_reuse.carbon
@@ -10,7 +10,7 @@
 package ExplorerTest api;
 
 __mixin Operations {
-  fn Square[me: Self](x:i32) -> i32{
+  fn Square[self: Self](x:i32) -> i32{
     return x * x;
   }
 }
diff --git a/explorer/testdata/mixin/use_mixin_method_in_class_method.carbon b/explorer/testdata/mixin/use_mixin_method_in_class_method.carbon
index 5693f4165946..04538db6b0dd 100644
--- a/explorer/testdata/mixin/use_mixin_method_in_class_method.carbon
+++ b/explorer/testdata/mixin/use_mixin_method_in_class_method.carbon
@@ -10,7 +10,7 @@
 package ExplorerTest api;
 
 __mixin Operations {
-  fn Square[me: Self](x:i32) -> i32{
+  fn Square[self: Self](x:i32) -> i32{
     return x * x;
   }
 }
@@ -18,8 +18,8 @@ __mixin Operations {
 class Point {
   var x: i32;
   var y: i32;
-  fn DistanceSquare[me:Self](other:Self) -> i32 {
-    return me.Square(me.x - other.x) + me.Square(me.y - other.y);
+  fn DistanceSquare[self: Self](other:Self) -> i32 {
+    return self.Square(self.x - other.x) + self.Square(self.y - other.y);
   }
   __mix Operations;
 }
@@ -28,8 +28,8 @@ class Complex {
   var r: i32;
   var i: i32;
   __mix Operations;
-  fn AbsSquare[me:Self]() -> i32 {
-    return me.Square(me.r) + me.Square(me.i);
+  fn AbsSquare[self: Self]() -> i32 {
+    return self.Square(self.r) + self.Square(self.i);
   }
 }
 
diff --git a/explorer/testdata/name_lookup/class_fn_body_reorder.carbon b/explorer/testdata/name_lookup/class_fn_body_reorder.carbon
index b4943e478a08..c374c052aafc 100644
--- a/explorer/testdata/name_lookup/class_fn_body_reorder.carbon
+++ b/explorer/testdata/name_lookup/class_fn_body_reorder.carbon
@@ -12,11 +12,11 @@ package ExplorerTest api;
 // The bodies of member functions are processed after all immediately enclosing
 // classes, impls, and interfaces.
 class A {
-  fn F[me: Self]() -> i32 {
-    return G() + me.H();
+  fn F[self: Self]() -> i32 {
+    return G() + self.H();
   }
   fn G() -> i32 { return 1; }
-  fn H[me: Self]() -> i32 { return 2; }
+  fn H[self: Self]() -> i32 { return 2; }
 }
 
 fn Main() -> i32 {
diff --git a/explorer/testdata/named_constraint/extends.carbon b/explorer/testdata/named_constraint/extends.carbon
index 76d703d8b2fa..4e9206d13063 100644
--- a/explorer/testdata/named_constraint/extends.carbon
+++ b/explorer/testdata/named_constraint/extends.carbon
@@ -15,7 +15,7 @@
 package ExplorerTest api;
 
 interface Maker(T:! Type) {
-  fn Make[me: Self]() -> T;
+  fn Make[self: Self]() -> T;
 }
 
 constraint IndirectMaker(T:! Type) {
@@ -29,7 +29,7 @@ constraint MoreIndirectMaker {
 class PointerFactory {
   var p: i32*;
   external impl as Maker(i32*) {
-    fn Make[me: Self]() -> i32* { return me.p; }
+    fn Make[self: Self]() -> i32* { return self.p; }
   }
 }
 
diff --git a/explorer/testdata/named_constraint/fail_compound_member_access.carbon b/explorer/testdata/named_constraint/fail_compound_member_access.carbon
index 4a9e5a738cf9..65efea6faf5b 100644
--- a/explorer/testdata/named_constraint/fail_compound_member_access.carbon
+++ b/explorer/testdata/named_constraint/fail_compound_member_access.carbon
@@ -10,7 +10,7 @@ package ExplorerTest api;
 
 interface MyAddWith(T:! Type) {
   let Result:! Type;
-  fn Op[me: Self](other: T) -> Result;
+  fn Op[self: Self](other: T) -> Result;
 }
 
 constraint MyAdd {
@@ -18,7 +18,7 @@ constraint MyAdd {
 }
 
 external impl i32 as MyAdd {
-  fn Op[me: i32](other: i32) -> i32 { return me + other; }
+  fn Op[self: i32](other: i32) -> i32 { return self + other; }
 }
 
 fn Main() -> i32 {
diff --git a/explorer/testdata/named_constraint/impl_as.carbon b/explorer/testdata/named_constraint/impl_as.carbon
index d54819fd7e52..30a97be12d61 100644
--- a/explorer/testdata/named_constraint/impl_as.carbon
+++ b/explorer/testdata/named_constraint/impl_as.carbon
@@ -11,7 +11,7 @@ package ExplorerTest api;
 
 interface MyHashable {
   let Result:! Type;
-  fn Hash[me: Self]() -> Result;
+  fn Hash[self: Self]() -> Result;
 }
 
 constraint HashToIntConvertible {
@@ -21,13 +21,13 @@ constraint HashToIntConvertible {
 
 class MyHashValue {
   external impl as ImplicitAs(i32) {
-    fn Convert[me: Self]() -> i32 { return 4; }
+    fn Convert[self: Self]() -> i32 { return 4; }
   }
 }
 
 class Widget {
   external impl as MyHashable where .Result = MyHashValue {
-    fn Hash[me: Self]() -> MyHashValue { return {}; }
+    fn Hash[self: Self]() -> MyHashValue { return {}; }
   }
 }
 
diff --git a/explorer/testdata/named_constraint/impl_constraint.carbon b/explorer/testdata/named_constraint/impl_constraint.carbon
index 3997f6ba6728..01896c53063b 100644
--- a/explorer/testdata/named_constraint/impl_constraint.carbon
+++ b/explorer/testdata/named_constraint/impl_constraint.carbon
@@ -10,11 +10,11 @@
 package ExplorerTest api;
 
 interface Runnable {
-  fn Run[me: Self]() -> i32;
+  fn Run[self: Self]() -> i32;
 }
 
 interface Walkable {
-  fn Walk[me: Self]() -> i32;
+  fn Walk[self: Self]() -> i32;
 }
 
 constraint Traversible {
@@ -23,11 +23,11 @@ constraint Traversible {
 }
 
 external impl i32 as Traversible {
-  fn Run[me: i32]() -> i32 {
-    return 10 * me;
+  fn Run[self: i32]() -> i32 {
+    return 10 * self;
   }
-  fn Walk[me: i32]() -> i32 {
-    return me + 1;
+  fn Walk[self: i32]() -> i32 {
+    return self + 1;
   }
 }
 
diff --git a/explorer/testdata/operators/add.carbon b/explorer/testdata/operators/add.carbon
index 621c9fa52abb..782a62eade55 100644
--- a/explorer/testdata/operators/add.carbon
+++ b/explorer/testdata/operators/add.carbon
@@ -12,7 +12,7 @@ package ExplorerTest api;
 class A { var n: i32; }
 
 external impl A as Add {
-  fn Op[me: Self](rhs: A) -> A { return {.n = me.n + rhs.n}; }
+  fn Op[self: Self](rhs: A) -> A { return {.n = self.n + rhs.n}; }
 }
 
 fn Main() -> i32 {
diff --git a/explorer/testdata/operators/add_with.carbon b/explorer/testdata/operators/add_with.carbon
index 42d1601c5b99..dbb303fcf049 100644
--- a/explorer/testdata/operators/add_with.carbon
+++ b/explorer/testdata/operators/add_with.carbon
@@ -12,7 +12,7 @@ package ExplorerTest api;
 class A { var n: i32; }
 
 external impl A as AddWith(i32) where .Result = A {
-  fn Op[me: Self](rhs: i32) -> A { return {.n = me.n + rhs}; }
+  fn Op[self: Self](rhs: i32) -> A { return {.n = self.n + rhs}; }
 }
 
 fn Main() -> i32 {
diff --git a/explorer/testdata/operators/bit_and.carbon b/explorer/testdata/operators/bit_and.carbon
index 538a413fd687..ad75dc03234a 100644
--- a/explorer/testdata/operators/bit_and.carbon
+++ b/explorer/testdata/operators/bit_and.carbon
@@ -12,7 +12,7 @@ package ExplorerTest api;
 class A { var n: i32; }
 
 external impl A as BitAndWith(i32) where .Result = A {
-  fn Op[me: Self](rhs: i32) -> A { return {.n = me.n & rhs}; }
+  fn Op[self: Self](rhs: i32) -> A { return {.n = self.n & rhs}; }
 }
 
 fn Main() -> i32 {
diff --git a/explorer/testdata/operators/bit_complement.carbon b/explorer/testdata/operators/bit_complement.carbon
index 45584750eeb6..380c27510e7d 100644
--- a/explorer/testdata/operators/bit_complement.carbon
+++ b/explorer/testdata/operators/bit_complement.carbon
@@ -12,7 +12,7 @@ package ExplorerTest api;
 class A { var n: i32; }
 
 external impl A as BitComplement where .Result = A {
-  fn Op[me: Self]() -> A { return {.n = ^me.n}; }
+  fn Op[self: Self]() -> A { return {.n = ^self.n}; }
 }
 
 fn Main() -> i32 {
diff --git a/explorer/testdata/operators/bit_or.carbon b/explorer/testdata/operators/bit_or.carbon
index f128b2d78c71..d31372cf3e84 100644
--- a/explorer/testdata/operators/bit_or.carbon
+++ b/explorer/testdata/operators/bit_or.carbon
@@ -12,7 +12,7 @@ package ExplorerTest api;
 class A { var n: i32; }
 
 external impl A as BitOrWith(i32) where .Result = A {
-  fn Op[me: Self](rhs: i32) -> A { return {.n = me.n | rhs}; }
+  fn Op[self: Self](rhs: i32) -> A { return {.n = self.n | rhs}; }
 }
 
 fn Main() -> i32 {
diff --git a/explorer/testdata/operators/bit_xor.carbon b/explorer/testdata/operators/bit_xor.carbon
index 6313bb620325..4139886cb75b 100644
--- a/explorer/testdata/operators/bit_xor.carbon
+++ b/explorer/testdata/operators/bit_xor.carbon
@@ -12,7 +12,7 @@ package ExplorerTest api;
 class A { var n: i32; }
 
 external impl A as BitXorWith(i32) where .Result = A {
-  fn Op[me: Self](rhs: i32) -> A { return {.n = me.n ^ rhs}; }
+  fn Op[self: Self](rhs: i32) -> A { return {.n = self.n ^ rhs}; }
 }
 
 fn Main() -> i32 {
diff --git a/explorer/testdata/operators/div.carbon b/explorer/testdata/operators/div.carbon
index 45934c7feb0e..924b86a808b6 100644
--- a/explorer/testdata/operators/div.carbon
+++ b/explorer/testdata/operators/div.carbon
@@ -12,7 +12,7 @@ package ExplorerTest api;
 class A { var n: i32; }
 
 external impl A as DivWith(i32) where .Result = A {
-  fn Op[me: Self](rhs: i32) -> A { return {.n = me.n / rhs}; }
+  fn Op[self: Self](rhs: i32) -> A { return {.n = self.n / rhs}; }
 }
 
 fn Main() -> i32 {
diff --git a/explorer/testdata/operators/left_shift.carbon b/explorer/testdata/operators/left_shift.carbon
index 854f5882e5ef..5e4dce9803fe 100644
--- a/explorer/testdata/operators/left_shift.carbon
+++ b/explorer/testdata/operators/left_shift.carbon
@@ -12,7 +12,7 @@ package ExplorerTest api;
 class A { var n: i32; }
 
 external impl A as LeftShiftWith(i32) where .Result = A {
-  fn Op[me: Self](rhs: i32) -> A { return {.n = me.n << rhs}; }
+  fn Op[self: Self](rhs: i32) -> A { return {.n = self.n << rhs}; }
 }
 
 fn Main() -> i32 {
diff --git a/explorer/testdata/operators/mod.carbon b/explorer/testdata/operators/mod.carbon
index a6fabb3ab535..643254a9bcf1 100644
--- a/explorer/testdata/operators/mod.carbon
+++ b/explorer/testdata/operators/mod.carbon
@@ -12,7 +12,7 @@ package ExplorerTest api;
 class A { var n: i32; }
 
 external impl A as ModWith(i32) where .Result = A {
-  fn Op[me: Self](rhs: i32) -> A { return {.n = me.n % rhs}; }
+  fn Op[self: Self](rhs: i32) -> A { return {.n = self.n % rhs}; }
 }
 
 fn Main() -> i32 {
diff --git a/explorer/testdata/operators/mul.carbon b/explorer/testdata/operators/mul.carbon
index 26c479d87e78..314c39edd5c6 100644
--- a/explorer/testdata/operators/mul.carbon
+++ b/explorer/testdata/operators/mul.carbon
@@ -12,7 +12,7 @@ package ExplorerTest api;
 class A { var n: i32; }
 
 external impl A as MulWith(i32) where .Result = A {
-  fn Op[me: Self](rhs: i32) -> A { return {.n = me.n * rhs}; }
+  fn Op[self: Self](rhs: i32) -> A { return {.n = self.n * rhs}; }
 }
 
 fn Main() -> i32 {
diff --git a/explorer/testdata/operators/negate.carbon b/explorer/testdata/operators/negate.carbon
index 635a23479b1a..a41cdc1c205a 100644
--- a/explorer/testdata/operators/negate.carbon
+++ b/explorer/testdata/operators/negate.carbon
@@ -12,7 +12,7 @@ package ExplorerTest api;
 class A { var n: i32; }
 
 external impl A as Negate where .Result = A {
-  fn Op[me: Self]() -> A { return {.n = -me.n}; }
+  fn Op[self: Self]() -> A { return {.n = -self.n}; }
 }
 
 fn Main() -> i32 {
diff --git a/explorer/testdata/operators/right_shift.carbon b/explorer/testdata/operators/right_shift.carbon
index 5b652ae076fd..34f576844f03 100644
--- a/explorer/testdata/operators/right_shift.carbon
+++ b/explorer/testdata/operators/right_shift.carbon
@@ -12,7 +12,7 @@ package ExplorerTest api;
 class A { var n: i32; }
 
 external impl A as RightShiftWith(i32) where .Result = A {
-  fn Op[me: Self](rhs: i32) -> A { return {.n = me.n >> rhs}; }
+  fn Op[self: Self](rhs: i32) -> A { return {.n = self.n >> rhs}; }
 }
 
 fn Main() -> i32 {
diff --git a/explorer/testdata/operators/sub.carbon b/explorer/testdata/operators/sub.carbon
index 7534123acaeb..531ef0e43a4e 100644
--- a/explorer/testdata/operators/sub.carbon
+++ b/explorer/testdata/operators/sub.carbon
@@ -12,7 +12,7 @@ package ExplorerTest api;
 class A { var n: i32; }
 
 external impl A as SubWith(i32) where .Result = A {
-  fn Op[me: Self](rhs: i32) -> A { return {.n = me.n - rhs}; }
+  fn Op[self: Self](rhs: i32) -> A { return {.n = self.n - rhs}; }
 }
 
 fn Main() -> i32 {
diff --git a/explorer/testdata/return/convert_return_value.carbon b/explorer/testdata/return/convert_return_value.carbon
index f160904608a5..8ace4732f3a2 100644
--- a/explorer/testdata/return/convert_return_value.carbon
+++ b/explorer/testdata/return/convert_return_value.carbon
@@ -11,7 +11,7 @@ package ExplorerTest api;
 
 class A {
   impl as ImplicitAs(i32) {
-    fn Convert[me: Self]() -> i32 { return 42; }
+    fn Convert[self: Self]() -> i32 { return 42; }
   }
 }
 
diff --git a/explorer/testdata/struct/equality.carbon b/explorer/testdata/struct/equality.carbon
index 7c17926dc40c..43c388cb098c 100644
--- a/explorer/testdata/struct/equality.carbon
+++ b/explorer/testdata/struct/equality.carbon
@@ -13,11 +13,11 @@ package ExplorerTest api;
 
 // TODO: Implement this with some kind of reflection?
 external impl {.x: i32, .y: i32} as EqWith(Self) {
-  fn Equal[me: Self](other: Self) -> bool {
-    return me.x == other.x and me.y == other.y;
+  fn Equal[self: Self](other: Self) -> bool {
+    return self.x == other.x and self.y == other.y;
   }
-  fn NotEqual[me: Self](other: Self) -> bool {
-    return me.x != other.x or me.y != other.y;
+  fn NotEqual[self: Self](other: Self) -> bool {
+    return self.x != other.x or self.y != other.y;
   }
 }
 
diff --git a/explorer/testdata/struct/equality_false.carbon b/explorer/testdata/struct/equality_false.carbon
index cb5d5a3ea681..961e48ee3ca4 100644
--- a/explorer/testdata/struct/equality_false.carbon
+++ b/explorer/testdata/struct/equality_false.carbon
@@ -11,11 +11,11 @@ package ExplorerTest api;
 
 // TODO: Implement this with some kind of reflection?
 external impl {.x: i32, .y: i32} as EqWith(Self) {
-  fn Equal[me: Self](other: Self) -> bool {
-    return me.x == other.x and me.y == other.y;
+  fn Equal[self: Self](other: Self) -> bool {
+    return self.x == other.x and self.y == other.y;
   }
-  fn NotEqual[me: Self](other: Self) -> bool {
-    return me.x != other.x or me.y != other.y;
+  fn NotEqual[self: Self](other: Self) -> bool {
+    return self.x != other.x or self.y != other.y;
   }
 }
 
diff --git a/explorer/testdata/struct/fail_equality_type.carbon b/explorer/testdata/struct/fail_equality_type.carbon
index a01e304613b4..642bb9f379dc 100644
--- a/explorer/testdata/struct/fail_equality_type.carbon
+++ b/explorer/testdata/struct/fail_equality_type.carbon
@@ -10,11 +10,11 @@ package ExplorerTest api;
 
 // TODO: Implement this with some kind of reflection?
 external impl {.x: i32, .y: i32} as EqWith(Self) {
-  fn Equal[me: Self](other: Self) -> bool {
-    return me.x == other.x and me.y == other.y;
+  fn Equal[self: Self](other: Self) -> bool {
+    return self.x == other.x and self.y == other.y;
   }
-  fn NotEqual[me: Self](other: Self) -> bool {
-    return me.x != other.x or me.y != other.y;
+  fn NotEqual[self: Self](other: Self) -> bool {
+    return self.x != other.x or self.y != other.y;
   }
 }
 
diff --git a/explorer/testdata/struct/field_convertible_to_type.carbon b/explorer/testdata/struct/field_convertible_to_type.carbon
index 3ea2ebafad7a..c256fb61b819 100644
--- a/explorer/testdata/struct/field_convertible_to_type.carbon
+++ b/explorer/testdata/struct/field_convertible_to_type.carbon
@@ -11,7 +11,7 @@ package ExplorerTest api;
 
 class TypeLike {
   impl as ImplicitAs(Type) {
-    fn Convert[me: Self]() -> Type { return i32; }
+    fn Convert[self: Self]() -> Type { return i32; }
   }
   fn Make() -> Self { return {}; }
 }
diff --git a/explorer/testdata/while/convert_condition.carbon b/explorer/testdata/while/convert_condition.carbon
index fb58c0b0e423..4adea6fb7181 100644
--- a/explorer/testdata/while/convert_condition.carbon
+++ b/explorer/testdata/while/convert_condition.carbon
@@ -13,8 +13,8 @@ class LazyNe {
   var v1: i32;
   var v2: i32;
   impl as ImplicitAs(bool) {
-    fn Convert[me: Self]() -> bool {
-      return not (me.v1 == me.v2);
+    fn Convert[self: Self]() -> bool {
+      return not (self.v1 == self.v2);
     }
   }
   fn Make(v1: i32, v2: i32) -> Self {
diff --git a/third_party/examples/re2/re2.carbon b/third_party/examples/re2/re2.carbon
index 72f907616bd6..f82e9004bcf8 100644
--- a/third_party/examples/re2/re2.carbon
+++ b/third_party/examples/re2/re2.carbon
@@ -290,52 +290,52 @@ class RE2 {
 
   // TODO: Should a Carbonic RE2 support these?
   impl StringView as ImplicitAs(RE2) {
-    fn Convert[me: Self]() -> RE2 { return Make(me); }
+    fn Convert[self: Self]() -> RE2 { return Make(self); }
   }
   impl String as ImplicitAs(RE2) {
-    fn Convert[me: Self]() -> RE2 { return Make(me); }
+    fn Convert[self: Self]() -> RE2 { return Make(self); }
   }
   impl StringPiece as ImplicitAs(RE2) {
-    fn Convert[me: Self]() -> RE2 { return Make(me); }
+    fn Convert[self: Self]() -> RE2 { return Make(self); }
   }
 
   impl as Destroyable;
 
   // Returns whether RE2 was created properly.
-  fn ok[me: Self]() -> bool { return me.error_code() == ErrorCode.NoError; }
+  fn ok[self: Self]() -> bool { return self.error_code() == ErrorCode.NoError; }
 
   // The string specification for this RE2.  E.g.
   //   RE2 re("ab*c?d+");
   //   re.pattern();    // "ab*c?d+"
-  fn pattern[me: Self]() -> String { return me.pattern_; }
+  fn pattern[self: Self]() -> String { return self.pattern_; }
 
   // If RE2 could not be created properly, returns an error string.
   // Else returns the empty string.
-  fn error[me: Self]() -> String { return *me.error_; }
+  fn error[self: Self]() -> String { return *self.error_; }
 
   // If RE2 could not be created properly, returns an error code.
   // Else returns RE2::NoError (== 0).
-  fn error_code[me: Self]() -> ErrorCode { return me.error_code_; }
+  fn error_code[self: Self]() -> ErrorCode { return self.error_code_; }
 
   // If RE2 could not be created properly, returns the offending
   // portion of the regexp.
-  fn error_arg[me: Self]() -> String { return me.error_arg_; }
+  fn error_arg[self: Self]() -> String { return self.error_arg_; }
 
   // Returns the program size, a very approximate measure of a regexp's "cost".
   // Larger numbers are more expensive than smaller numbers.
-  fn ProgramSize[me: Self]() -> i32;
-  fn ReverseProgramSize[me: Self]() -> i32;
+  fn ProgramSize[self: Self]() -> i32;
+  fn ReverseProgramSize[self: Self]() -> i32;
 
   // If histogram is not null, outputs the program fanout
   // as a histogram bucketed by powers of 2.
   // Returns the number of the largest non-empty bucket.
-  fn ProgramFanout[me: Self](histogram: Cpp.std.vector(i32)*) -> i32;
-  fn ReverseProgramFanout[me: Self](histogram: Cpp.std.vector(i32)*) -> i32;
+  fn ProgramFanout[self: Self](histogram: Cpp.std.vector(i32)*) -> i32;
+  fn ReverseProgramFanout[self: Self](histogram: Cpp.std.vector(i32)*) -> i32;
 
   // Returns the underlying Regexp; not for general use.
   // Returns entire_regexp_ so that callers don't need
   // to know about prefix_ and prefix_foldcase_.
-  fn Regexp[me: Self]() -> package.Regexp* { return me.entire_regexp_; }
+  fn Regexp[self: Self]() -> package.Regexp* { return self.entire_regexp_; }
 
   /***** The array-based matching interface ******/
 
@@ -535,7 +535,7 @@ class RE2 {
   // do not compile down to infinite repetitions.
   //
   // Returns true on success, false on error.
-  fn PossibleMatchRange[me: Self](min: String*, max: String*, maxlen: i32);
+  fn PossibleMatchRange[self: Self](min: String*, max: String*, maxlen: i32);
 
   // Generic matching interface
 
@@ -552,18 +552,18 @@ class RE2 {
   // Return the number of capturing subpatterns, or -1 if the
   // regexp wasn't valid on construction.  The overall match ($0)
   // does not count: if the regexp is "(a)(b)", returns 2.
-  fn NumberOfCapturingGroups[me: Self]() -> i32 { return me.num_captures_; }
+  fn NumberOfCapturingGroups[self: Self]() -> i32 { return self.num_captures_; }
 
   // Return a map from names to capturing indices.
   // The map records the index of the leftmost group
   // with the given name.
   // NOTE: Originally returned by reference with comment "valid until re is deleted".
-  fn NamedCapturingGroups[me: Self]() -> Map(String, i32);
+  fn NamedCapturingGroups[self: Self]() -> Map(String, i32);
 
   // Return a map from capturing indices to names.
   // The map has no entries for unnamed groups.
   // NOTE: Originally returned by reference with comment "valid until re is deleted".
-  fn CapturingGroupNames[me: Self]() -> Map(i32, String);
+  fn CapturingGroupNames[self: Self]() -> Map(i32, String);
 
   // General matching routine.
   // Match against text starting at offset startpos
@@ -586,7 +586,7 @@ class RE2 {
   // empty string, but note that on return, it will not be possible to tell
   // whether submatch i matched the empty string or did not match:
   // either way, submatch[i].data() == NULL.
-  fn Match[me: Self](text: StringPiece,
+  fn Match[self: Self](text: StringPiece,
                      startpos: i64,
                      endpos: i64,
                      re_anchor: Anchor,
@@ -602,7 +602,7 @@ class RE2 {
   //     '\' followed by anything other than a digit or '\'.
   // A true return value guarantees that Replace() and Extract() won't
   // fail because of a bad rewrite string.
-  fn CheckRewriteString[me: Self](rewrite: StringPiece, error: String*) -> bool;
+  fn CheckRewriteString[self: Self](rewrite: StringPiece, error: String*) -> bool;
 
   // Returns the maximum submatch needed for the rewrite to be done by
   // Replace(). E.g. if rewrite == "foo \\2,\\1", returns 2.
@@ -613,7 +613,7 @@ class RE2 {
   // Returns true on success.  This method can fail because of a malformed
   // rewrite string.  CheckRewriteString guarantees that the rewrite will
   // be successful.
-  fn Rewrite[me: Self](out: String*, rewrite: StringPiece,
+  fn Rewrite[self: Self](out: String*, rewrite: StringPiece,
                        vec: ArrayIterator(StringPiece), veclen: i32)
     -> bool;
 
@@ -696,50 +696,50 @@ class RE2 {
 
     impl CannedOptions as ImplicitAs(Self);
 
-    fn encoding[me: Self]() -> Encoding { return me.encoding_; }
-    fn set_encoding[addr me: Self*](encoding: Encoding) { me->encoding_ = encoding; }
+    fn encoding[self: Self]() -> Encoding { return self.encoding_; }
+    fn set_encoding[addr self: Self*](encoding: Encoding) { self->encoding_ = encoding; }
 
-    fn posix_syntax[me: Self]() -> bool { return me.posix_syntax_; }
-    fn set_posix_syntax[addr me: Self*](b: bool) { me->posix_syntax_ = b; }
+    fn posix_syntax[self: Self]() -> bool { return self.posix_syntax_; }
+    fn set_posix_syntax[addr self: Self*](b: bool) { self->posix_syntax_ = b; }
 
-    fn longest_match[me: Self]() -> bool { return me.longest_match_; }
-    fn set_longest_match[addr me: Self*](b: bool) { me->longest_match_ = b; }
+    fn longest_match[self: Self]() -> bool { return self.longest_match_; }
+    fn set_longest_match[addr self: Self*](b: bool) { self->longest_match_ = b; }
 
-    fn log_errors[me: Self]() -> bool { return me.log_errors_; }
-    fn set_log_errors[addr me: Self*](b: bool) { me->log_errors_ = b; }
+    fn log_errors[self: Self]() -> bool { return self.log_errors_; }
+    fn set_log_errors[addr self: Self*](b: bool) { self->log_errors_ = b; }
 
-    fn max_mem[me: Self]() -> i64 { return me.max_mem_; }
-    fn set_max_mem[addr me: Self*](m: i64) { me->max_mem_ = m; }
+    fn max_mem[self: Self]() -> i64 { return self.max_mem_; }
+    fn set_max_mem[addr self: Self*](m: i64) { self->max_mem_ = m; }
 
-    fn literal[me: Self]() -> bool { return me.literal_; }
-    fn set_literal[addr me: Self*](b: bool) { me->literal_ = b; }
+    fn literal[self: Self]() -> bool { return self.literal_; }
+    fn set_literal[addr self: Self*](b: bool) { self->literal_ = b; }
 
-    fn never_nl[me: Self]() -> bool { return me.never_nl_; }
-    fn set_never_nl[addr me: Self*](b: bool) { me->never_nl_ = b; }
+    fn never_nl[self: Self]() -> bool { return self.never_nl_; }
+    fn set_never_nl[addr self: Self*](b: bool) { self->never_nl_ = b; }
 
-    fn dot_nl[me: Self]() -> bool { return me.dot_nl_; }
-    fn set_dot_nl[addr me: Self*](b: bool) { me->dot_nl_ = b; }
+    fn dot_nl[self: Self]() -> bool { return self.dot_nl_; }
+    fn set_dot_nl[addr self: Self*](b: bool) { self->dot_nl_ = b; }
 
-    fn never_capture[me: Self]() -> bool { return me.never_capture_; }
-    fn set_never_capture[addr me: Self*](b: bool) { me->never_capture_ = b; }
+    fn never_capture[self: Self]() -> bool { return self.never_capture_; }
+    fn set_never_capture[addr self: Self*](b: bool) { self->never_capture_ = b; }
 
-    fn case_sensitive[me: Self]() -> bool { return me.case_sensitive_; }
-    fn set_case_sensitive[addr me: Self*](b: bool) { me->case_sensitive_ = b; }
+    fn case_sensitive[self: Self]() -> bool { return self.case_sensitive_; }
+    fn set_case_sensitive[addr self: Self*](b: bool) { self->case_sensitive_ = b; }
 
-    fn perl_classes[me: Self]() -> bool { return me.perl_classes_; }
-    fn set_perl_classes[addr me: Self*](b: bool) { me->perl_classes_ = b; }
+    fn perl_classes[self: Self]() -> bool { return self.perl_classes_; }
+    fn set_perl_classes[addr self: Self*](b: bool) { self->perl_classes_ = b; }
 
-    fn word_boundary[me: Self]() -> bool { return me.word_boundary_; }
-    fn set_word_boundary[addr me: Self*](b: bool) { me->word_boundary_ = b; }
+    fn word_boundary[self: Self]() -> bool { return self.word_boundary_; }
+    fn set_word_boundary[addr self: Self*](b: bool) { self->word_boundary_ = b; }
 
-    fn one_line[me: Self]() -> bool { return me.one_line_; }
-    fn set_one_line[addr me: Self*](b: bool) { me->one_line_ = b; }
+    fn one_line[self: Self]() -> bool { return self.one_line_; }
+    fn set_one_line[addr self: Self*](b: bool) { self->one_line_ = b; }
 
-    fn Copy[addr me: Self*](src: Options) {
-      *me = src;
+    fn Copy[addr self: Self*](src: Options) {
+      *self = src;
     }
 
-    fn ParseFlags[me: Self]() -> i32;
+    fn ParseFlags[self: Self]() -> i32;
 
     private var encoding_: Encoding;
     private var posix_syntax_: bool;
@@ -757,7 +757,7 @@ class RE2 {
   };
 
   // Returns the options set in the constructor.
-  fn options[me: Self]() -> Options { return me.options_; }
+  fn options[self: Self]() -> Options { return self.options_; }
 
   // Argument converters; see below.
   // TODO: Should these be package members not class members in Carbon
@@ -766,9 +766,9 @@ class RE2 {
   fn Hex[T:! Parse4ary](ptr: T*) -> Self.Arg;
   fn Octal[T:! Parse4ary](ptr: T*) -> Self.Arg;
 
-  private fn Init[addr me: Self](pattern: StringPiece, options: Options);
+  private fn Init[addr self: Self](pattern: StringPiece, options: Options);
 
-  private fn DoMatch[me: Self](text: StringPiece,
+  private fn DoMatch[self: Self](text: StringPiece,
                                re_anchor: Anchor,
                                consumed: i64*,
                                // TODO: Pointer to `const Arg`.
@@ -776,7 +776,7 @@ class RE2 {
                                n: i32)
     -> bool;
 
-  fn ReverseProg[me: Self]() -> package.Prog*;
+  fn ReverseProg[self: Self]() -> package.Prog*;
 
   // string regular expression
   private var pattern_: String;
@@ -853,30 +853,30 @@ class RE2.Arg {
   fn Make(nullptr) -> Self { return Make(nullptr as NullArg*); }
 
   interface Parseable {
-    fn Parse[addr me: Self*](str: StringView, n: i64) -> bool;
+    fn Parse[addr self: Self*](str: StringView, n: i64) -> bool;
   }
   match_first {
     impl [T:! Parse3ary] T as Parseable {
-      fn Parse[addr me: Self*](str: StringView, n: i64) -> bool {
-        return T.Parse(str, n, me);
+      fn Parse[addr self: Self*](str: StringView, n: i64) -> bool {
+        return T.Parse(str, n, self);
       }
     }
     impl [T:! Parse4ary] T as Parseable {
-      fn Parse[addr me: Self*](str: StringView, n: i64) -> bool {
-        return T.Parse(str, n, me, 10);
+      fn Parse[addr self: Self*](str: StringView, n: i64) -> bool {
+        return T.Parse(str, n, self, 10);
       }
     }
     impl [T:! ParseFrom] T as Parseable {
-      fn Parse[addr me: Self*](str: StringView, n: i64) -> bool {
-        if (me == nullptr) { return true; }
-        return T.Parse(str, n, me);
+      fn Parse[addr self: Self*](str: StringView, n: i64) -> bool {
+        if (self == nullptr) { return true; }
+        return T.Parse(str, n, self);
       }
     }
   }
 
   private class NullArg {}
   impl NullArg as Parseable {
-    fn Parse[addr me: Self*](str: StringView, n: i64) -> bool {
+    fn Parse[addr self: Self*](str: StringView, n: i64) -> bool {
       return true;
     }
   }
@@ -885,8 +885,8 @@ class RE2.Arg {
     return {.type_ = T, .arg_ = ptr};
   }
 
-  fn Parse[me: Self](str: StringView, n: i64) -> bool {
-    return me.arg_->Parse(str, n);
+  fn Parse[self: Self](str: StringView, n: i64) -> bool {
+    return self.arg_->Parse(str, n);
   }
 
   // TODO: Existential types or `DynPtr(Parseable)`.
@@ -896,8 +896,8 @@ class RE2.Arg {
 
 private adapter ParseAsBase(T:! Parse4ary, base: i32) for T {
   impl as Self.Arg.Parseable {
-    fn Parse[addr me: Self*](str: StringView, n: i64) -> bool {
-      return T.Parse(str, n, me, base);
+    fn Parse[addr self: Self*](str: StringView, n: i64) -> bool {
+      return T.Parse(str, n, self, base);
     }
   }
 }
@@ -938,12 +938,12 @@ class LazyRE2 {
 
   // Pretend to be a pointer to Type (never NULL due to on-demand creation):
   impl as Pointer where .Pointee = RE2 {
-    fn Resolve[me: Self]() -> Pointee* { return me.get(); }
+    fn Resolve[self: Self]() -> Pointee* { return self.get(); }
   }
 
   // Named accessor/initializer:
-  fn get[addr me: Self*]() -> RE* {
-    Cpp.std.call_once(once_, Self.Init, me);
+  fn get[addr self: Self*]() -> RE* {
+    Cpp.std.call_once(once_, Self.Init, self);
     return ptr_;
   }
 
diff --git a/utils/highlightjs/highlightjs_carbon_lang.js b/utils/highlightjs/highlightjs_carbon_lang.js
index a17ab6d6450b..8c7d54965616 100644
--- a/utils/highlightjs/highlightjs_carbon_lang.js
+++ b/utils/highlightjs/highlightjs_carbon_lang.js
@@ -56,7 +56,7 @@ export default function (hljs) {
       'library',
       'like',
       'match',
-      'me',
+      'self',
       'namespace',
       'not',
       'observe',
@@ -269,8 +269,8 @@ export default function (hljs) {
     returnEnd: true,
     contains: [...EXPRESSION],
   };
-  const ME_PATTERN = {
-    scope: 'carbon-me-pattern',
+  const SELF_PATTERN = {
+    scope: 'carbon-self-pattern',
     begin: [/(\b(addr|var)\b)?/, /\s*/, /\bme/, /:/, /\s*/],
     beginScope: {
       1: 'keyword',
@@ -281,7 +281,11 @@ export default function (hljs) {
     returnEnd: true,
     contains: [...EXPRESSION],
   };
-  const UNPARENTHESIZED_PATTERNS = [ME_PATTERN, BINDING_PATTERN, VALUE_PATTERN];
+  const UNPARENTHESIZED_PATTERNS = [
+    SELF_PATTERN,
+    BINDING_PATTERN,
+    VALUE_PATTERN,
+  ];
   const PARENTHESIZED_PATTERN = {
     scope: 'carbon-parenthesized-pattern',
     begin: /\(/,
diff --git a/utils/highlightjs/highlightjs_example.html b/utils/highlightjs/highlightjs_example.html
index 0a431e437567..3df0e87f40e1 100644
--- a/utils/highlightjs/highlightjs_example.html
+++ b/utils/highlightjs/highlightjs_example.html
@@ -50,14 +50,14 @@ constraint WidgetC {
 }
 
 abstract class Abstract {
-  abstract fn DoSomething[me: Self]();
+  abstract fn DoSomething[self: Self]();
 }
 
 base class Widget {
-  virtual fn Print[addr me: Self*](var i: i64, x: f32 = 4.2, _: bool);
+  virtual fn Print[addr self: Self*](var i: i64, x: f32 = 4.2, _: bool);
 }
 
-fn Widget.Print[addr me: Self*](var i: i64, x: f32, _: bool, 47) {
+fn Widget.Print[addr self: Self*](var i: i64, x: f32, _: bool, 47) {
   Carbon.Print("test" + "t\u{FFFF}his");
   Carbon.Print(
       """
@@ -72,14 +72,14 @@ fn Widget.Print[addr me: Self*](var i: i64, x: f32, _: bool, 47) {
 }
 
 class FancyWidget(T:! Type) extends Widget {
-  impl fn Print[me: Self]();
+  impl fn Print[self: Self]();
 
   impl as Add(T) {
-    fn Op[me: Self]();
+    fn Op[self: Self]();
   }
 }
 
-fn FancyWidget(T:! Type).Print[me: Self]() {
+fn FancyWidget(T:! Type).Print[self: Self]() {
   Carbon.Print("more test");
 }
 
diff --git a/utils/textmate/Samples/main.carbon b/utils/textmate/Samples/main.carbon
index 3ad666d83a04..838ca9a411d0 100644
--- a/utils/textmate/Samples/main.carbon
+++ b/utils/textmate/Samples/main.carbon
@@ -7,11 +7,11 @@
 package Carbon api;
 
 interface HasValueParam(T:! Type, V:! T) {
-  fn Go[me: Self]() -> T;
+  fn Go[self: Self]() -> T;
 }
 
 impl () as HasValueParam(i32, 5) {
-  fn Go[me: Self]() -> i32 { return 42; }
+  fn Go[self: Self]() -> i32 { return 42; }
 }
 
 class Point {