diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/JavaLangClash.java b/core/src/main/java/com/google/errorprone/bugpatterns/AvoidCommonTypeNames.java
similarity index 98%
rename from core/src/main/java/com/google/errorprone/bugpatterns/JavaLangClash.java
rename to core/src/main/java/com/google/errorprone/bugpatterns/AvoidCommonTypeNames.java
index 4d90012073a..d07cf354668 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/JavaLangClash.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/AvoidCommonTypeNames.java
@@ -45,10 +45,11 @@
 
 /** A {@link BugChecker}; see the associated {@link BugPattern} annotation for details. */
 @BugPattern(
+    altNames = "JavaLangClash",
     summary = "Never reuse class names from java.lang",
     severity = WARNING,
     tags = StandardTags.STYLE)
-public class JavaLangClash extends BugChecker
+public class AvoidCommonTypeNames extends BugChecker
     implements ClassTreeMatcher, TypeParameterTreeMatcher {
 
   @Override
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 5f1f51d9d75..aceee1d25cf 100644
--- a/core/src/main/java/com/google/errorprone/scanner/BuiltInCheckerSuppliers.java
+++ b/core/src/main/java/com/google/errorprone/scanner/BuiltInCheckerSuppliers.java
@@ -48,6 +48,7 @@
 import com.google.errorprone.bugpatterns.AutoValueFinalMethods;
 import com.google.errorprone.bugpatterns.AutoValueImmutableFields;
 import com.google.errorprone.bugpatterns.AutoValueSubclassLeaked;
+import com.google.errorprone.bugpatterns.AvoidCommonTypeNames;
 import com.google.errorprone.bugpatterns.AvoidObjectArrays;
 import com.google.errorprone.bugpatterns.AvoidValueSetter;
 import com.google.errorprone.bugpatterns.BadAnnotationImplementation;
@@ -225,7 +226,6 @@
 import com.google.errorprone.bugpatterns.JUnitAssertSameCheck;
 import com.google.errorprone.bugpatterns.JUnitMethodInvoked;
 import com.google.errorprone.bugpatterns.JUnitParameterMethodNotFound;
-import com.google.errorprone.bugpatterns.JavaLangClash;
 import com.google.errorprone.bugpatterns.JavaUtilDateChecker;
 import com.google.errorprone.bugpatterns.JdkObsolete;
 import com.google.errorprone.bugpatterns.LabelledBreakTarget;
@@ -931,6 +931,7 @@ public static ScannerSupplier warningChecks() {
           AutoValueFinalMethods.class,
           AutoValueImmutableFields.class,
           AutoValueSubclassLeaked.class,
+          AvoidCommonTypeNames.class,
           AvoidValueSetter.class,
           BadComparable.class,
           BadImport.class,
@@ -1051,7 +1052,6 @@ public static ScannerSupplier warningChecks() {
           JavaDurationWithNanos.class,
           JavaDurationWithSeconds.class,
           JavaInstantGetSecondsGetNano.class,
-          JavaLangClash.class,
           JavaLocalDateTimeGetNano.class,
           JavaLocalTimeGetNano.class,
           JavaPeriodGetDays.class,
diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/JavaLangClashTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/AvoidCommonTypeNamesTest.java
similarity index 94%
rename from core/src/test/java/com/google/errorprone/bugpatterns/JavaLangClashTest.java
rename to core/src/test/java/com/google/errorprone/bugpatterns/AvoidCommonTypeNamesTest.java
index 4b2f56faa3f..d51192ca0c5 100644
--- a/core/src/test/java/com/google/errorprone/bugpatterns/JavaLangClashTest.java
+++ b/core/src/test/java/com/google/errorprone/bugpatterns/AvoidCommonTypeNamesTest.java
@@ -22,12 +22,12 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-/** {@link JavaLangClash}Test */
+/** {@link AvoidCommonTypeNames}Test */
 @RunWith(JUnit4.class)
-public class JavaLangClashTest {
+public class AvoidCommonTypeNamesTest {
 
   private final CompilationTestHelper testHelper =
-      CompilationTestHelper.newInstance(JavaLangClash.class, getClass());
+      CompilationTestHelper.newInstance(AvoidCommonTypeNames.class, getClass());
 
   // TODO(b/67718586): javac 9 doesn't want to compile sources in java.lang
   private static final ImmutableList<String> JAVA8_JAVACOPTS =
diff --git a/docs/bugpattern/JavaLangClash.md b/docs/bugpattern/AvoidCommonTypeNames.md
similarity index 100%
rename from docs/bugpattern/JavaLangClash.md
rename to docs/bugpattern/AvoidCommonTypeNames.md