diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/PackageInfo.java b/core/src/main/java/com/google/errorprone/bugpatterns/PackageInfo.java
index 03d5cd50e89..829ec3bb560 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/PackageInfo.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/PackageInfo.java
@@ -23,6 +23,7 @@
 import com.google.errorprone.VisitorState;
 import com.google.errorprone.bugpatterns.BugChecker.CompilationUnitTreeMatcher;
 import com.google.errorprone.matchers.Description;
+import com.google.errorprone.util.ASTHelpers;
 import com.sun.source.tree.CompilationUnitTree;
 
 /** A {@link BugChecker}; see the associated {@link BugPattern} annotation for details. */
@@ -36,7 +37,7 @@ public Description matchCompilationUnit(CompilationUnitTree tree, VisitorState s
     if (tree.getSourceFile() == null) {
       return NO_MATCH;
     }
-    String name = tree.getSourceFile().getName();
+    String name = ASTHelpers.getFileName(tree);
     int idx = name.lastIndexOf('/');
     if (idx != -1) {
       name = name.substring(idx + 1);
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessarilyFullyQualified.java b/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessarilyFullyQualified.java
index ff07de98ab1..79d5ef4609f 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessarilyFullyQualified.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessarilyFullyQualified.java
@@ -32,6 +32,7 @@
 import com.google.errorprone.bugpatterns.BugChecker.CompilationUnitTreeMatcher;
 import com.google.errorprone.fixes.SuggestedFix;
 import com.google.errorprone.matchers.Description;
+import com.google.errorprone.util.ASTHelpers;
 import com.sun.source.tree.CompilationUnitTree;
 import com.sun.source.tree.IdentifierTree;
 import com.sun.source.tree.ImportTree;
@@ -188,7 +189,7 @@ public Void visitIdentifier(IdentifierTree identifierTree, Void aVoid) {
   }
 
   private static boolean isPackageInfo(CompilationUnitTree tree) {
-    String name = tree.getSourceFile().getName();
+    String name = ASTHelpers.getFileName(tree);
     int idx = name.lastIndexOf('/');
     if (idx != -1) {
       name = name.substring(idx + 1);