diff --git a/src/google/protobuf/compiler/java/names.cc b/src/google/protobuf/compiler/java/names.cc
index d84e55ac371fb..2fd57a7f14a8e 100644
--- a/src/google/protobuf/compiler/java/names.cc
+++ b/src/google/protobuf/compiler/java/names.cc
@@ -122,7 +122,7 @@ std::string FileJavaPackage(const FileDescriptor* file, bool immutable,
 }
 
 std::string FileJavaPackage(const FileDescriptor* file) {
-  return Proto2DefaultJavaPackage(file);
+  return Proto2DefaultJavaPackage(*file);
 }
 
 std::string JavaPackageDirectory(const FileDescriptor* file) {
diff --git a/src/google/protobuf/compiler/java/names_internal.h b/src/google/protobuf/compiler/java/names_internal.h
index 96aba92104aa4..bc4b82b7f975f 100644
--- a/src/google/protobuf/compiler/java/names_internal.h
+++ b/src/google/protobuf/compiler/java/names_internal.h
@@ -33,19 +33,19 @@ inline std::string JoinPackage(absl::string_view a, absl::string_view b) {
   }
 }
 
-inline std::string DefaultJavaPackage(const FileDescriptor* file) {
-  if (file->options().has_java_package()) {
-    return file->options().java_package();
+inline std::string DefaultJavaPackage(const FileDescriptor& file) {
+  if (file.options().has_java_package()) {
+    return file.options().java_package();
   } else {
     return JoinPackage(google::protobuf::internal::IsOss() ? "" : "com.google.protos",
-                       file->package());
+                       file.package());
   }
 }
 
 // The package name to use for a file that is being compiled as proto2-API.
 // If the file is declared as proto1-API, this may involve using the alternate
 // package name.
-inline std::string Proto2DefaultJavaPackage(const FileDescriptor* file) {
+inline std::string Proto2DefaultJavaPackage(const FileDescriptor& file) {
 
   return DefaultJavaPackage(file);
 }