diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/TruthSelfEquals.java b/core/src/main/java/com/google/errorprone/bugpatterns/SelfAssertion.java
similarity index 95%
rename from core/src/main/java/com/google/errorprone/bugpatterns/TruthSelfEquals.java
rename to core/src/main/java/com/google/errorprone/bugpatterns/SelfAssertion.java
index a398973df24..bb01f21d2b5 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/TruthSelfEquals.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/SelfAssertion.java
@@ -41,9 +41,11 @@
 import javax.inject.Inject;
 
 /** A {@link BugPattern}; see the summary. */
-// TODO(ghm): Rename to SelfAssertion or something.
-@BugPattern(summary = "This assertion will always fail or succeed.", severity = ERROR)
-public final class TruthSelfEquals extends BugChecker implements MethodInvocationTreeMatcher {
+@BugPattern(
+    summary = "This assertion will always fail or succeed.",
+    altNames = "TruthSelfEquals",
+    severity = ERROR)
+public final class SelfAssertion extends BugChecker implements MethodInvocationTreeMatcher {
 
   private final Matcher<MethodInvocationTree> equalsMatcher =
       anyOf(
@@ -87,7 +89,7 @@ public final class TruthSelfEquals extends BugChecker implements MethodInvocatio
   private final ConstantExpressions constantExpressions;
 
   @Inject
-  TruthSelfEquals(ConstantExpressions constantExpressions) {
+  SelfAssertion(ConstantExpressions constantExpressions) {
     this.constantExpressions = constantExpressions;
   }
 
diff --git a/core/src/main/java/com/google/errorprone/scanner/BuiltInCheckerSuppliers.java b/core/src/main/java/com/google/errorprone/scanner/BuiltInCheckerSuppliers.java
index 04143a1e250..c8dab81d18f 100644
--- a/core/src/main/java/com/google/errorprone/scanner/BuiltInCheckerSuppliers.java
+++ b/core/src/main/java/com/google/errorprone/scanner/BuiltInCheckerSuppliers.java
@@ -330,6 +330,7 @@
 import com.google.errorprone.bugpatterns.RxReturnValueIgnored;
 import com.google.errorprone.bugpatterns.SameNameButDifferent;
 import com.google.errorprone.bugpatterns.SelfAlwaysReturnsThis;
+import com.google.errorprone.bugpatterns.SelfAssertion;
 import com.google.errorprone.bugpatterns.SelfAssignment;
 import com.google.errorprone.bugpatterns.SelfComparison;
 import com.google.errorprone.bugpatterns.SelfEquals;
@@ -378,7 +379,6 @@
 import com.google.errorprone.bugpatterns.TruthConstantAsserts;
 import com.google.errorprone.bugpatterns.TruthContainsExactlyElementsInUsage;
 import com.google.errorprone.bugpatterns.TruthGetOrDefault;
-import com.google.errorprone.bugpatterns.TruthSelfEquals;
 import com.google.errorprone.bugpatterns.TryFailRefactoring;
 import com.google.errorprone.bugpatterns.TryFailThrowable;
 import com.google.errorprone.bugpatterns.TryWithResourcesVariable;
@@ -797,6 +797,7 @@ public static ScannerSupplier warningChecks() {
           RequiredModifiersChecker.class,
           RestrictedApiChecker.class,
           ReturnValueIgnored.class,
+          SelfAssertion.class,
           SelfAssignment.class,
           SelfComparison.class,
           SelfEquals.class,
@@ -812,7 +813,6 @@ public static ScannerSupplier warningChecks() {
           ThrowIfUncheckedKnownChecked.class,
           ThrowNull.class,
           TreeToString.class,
-          TruthSelfEquals.class,
           TryFailThrowable.class,
           TypeParameterQualifier.class,
           UnicodeDirectionalityCharacters.class,
diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/TruthSelfEqualsTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/SelfAssertionTest.java
similarity index 92%
rename from core/src/test/java/com/google/errorprone/bugpatterns/TruthSelfEqualsTest.java
rename to core/src/test/java/com/google/errorprone/bugpatterns/SelfAssertionTest.java
index bdb198cab99..a6f58ccac10 100644
--- a/core/src/test/java/com/google/errorprone/bugpatterns/TruthSelfEqualsTest.java
+++ b/core/src/test/java/com/google/errorprone/bugpatterns/SelfAssertionTest.java
@@ -23,27 +23,27 @@
 import org.junit.runners.JUnit4;
 
 /**
- * Unit tests for {@link TruthSelfEquals} bug pattern.
+ * Unit tests for {@link SelfAssertion} bug pattern.
  *
  * @author bhagwani@google.com (Sumit Bhagwani)
  */
 @RunWith(JUnit4.class)
-public class TruthSelfEqualsTest {
+public class SelfAssertionTest {
   CompilationTestHelper compilationHelper;
 
   @Before
   public void setUp() {
-    compilationHelper = CompilationTestHelper.newInstance(TruthSelfEquals.class, getClass());
+    compilationHelper = CompilationTestHelper.newInstance(SelfAssertion.class, getClass());
   }
 
   @Test
   public void positiveCase() {
-    compilationHelper.addSourceFile("TruthSelfEqualsPositiveCases.java").doTest();
+    compilationHelper.addSourceFile("SelfAssertionPositiveCases.java").doTest();
   }
 
   @Test
   public void negativeCase() {
-    compilationHelper.addSourceFile("TruthSelfEqualsNegativeCases.java").doTest();
+    compilationHelper.addSourceFile("SelfAssertionNegativeCases.java").doTest();
   }
 
   // regression test for b/32107126
diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/testdata/TruthSelfEqualsNegativeCases.java b/core/src/test/java/com/google/errorprone/bugpatterns/testdata/SelfAssertionNegativeCases.java
similarity index 91%
rename from core/src/test/java/com/google/errorprone/bugpatterns/testdata/TruthSelfEqualsNegativeCases.java
rename to core/src/test/java/com/google/errorprone/bugpatterns/testdata/SelfAssertionNegativeCases.java
index 3daae906779..13c70c044a0 100644
--- a/core/src/test/java/com/google/errorprone/bugpatterns/testdata/TruthSelfEqualsNegativeCases.java
+++ b/core/src/test/java/com/google/errorprone/bugpatterns/testdata/SelfAssertionNegativeCases.java
@@ -19,11 +19,11 @@
 import static com.google.common.truth.Truth.assertThat;
 
 /**
- * Negative test cases for TruthSelfEquals check.
+ * Negative test cases for SelfAssertion check.
  *
  * @author bhagwani@google.com (Sumit Bhagwani)
  */
-public class TruthSelfEqualsNegativeCases {
+public class SelfAssertionNegativeCases {
 
   public void testEq() {
     assertThat(Boolean.TRUE.toString()).isEqualTo(Boolean.FALSE.toString());
diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/testdata/TruthSelfEqualsPositiveCases.java b/core/src/test/java/com/google/errorprone/bugpatterns/testdata/SelfAssertionPositiveCases.java
similarity index 95%
rename from core/src/test/java/com/google/errorprone/bugpatterns/testdata/TruthSelfEqualsPositiveCases.java
rename to core/src/test/java/com/google/errorprone/bugpatterns/testdata/SelfAssertionPositiveCases.java
index dbbe6487e97..a81fa607036 100644
--- a/core/src/test/java/com/google/errorprone/bugpatterns/testdata/TruthSelfEqualsPositiveCases.java
+++ b/core/src/test/java/com/google/errorprone/bugpatterns/testdata/SelfAssertionPositiveCases.java
@@ -20,11 +20,11 @@
 import static com.google.common.truth.Truth.assertWithMessage;
 
 /**
- * Positive test cases for TruthSelfEquals check.
+ * Positive test cases for SelfAssertion check.
  *
  * @author bhagwani@google.com (Sumit Bhagwani)
  */
-public class TruthSelfEqualsPositiveCases {
+public class SelfAssertionPositiveCases {
 
   public void testAssertThatEq() {
     String test = Boolean.TRUE.toString();
diff --git a/docs/bugpattern/TruthSelfEquals.md b/docs/bugpattern/SelfAssertion.md
similarity index 100%
rename from docs/bugpattern/TruthSelfEquals.md
rename to docs/bugpattern/SelfAssertion.md