1 files changed, 6 insertions, 6 deletions
diff --git a/src/google/protobuf/generated_message_reflection.h b/src/google/protobuf/generated_message_reflection.h
index e6670aea..c1c142fa 100644
--- a/src/google/protobuf/generated_message_reflection.h
+++ b/src/google/protobuf/generated_message_reflection.h
@@ -50,9 +50,9 @@
 
 namespace google {
 namespace upb {
-namespace proto2_bridge_opensource {
-class FieldAccessor;
-}  // namespace protobuf_bridge_google3
+namespace google_opensource {
+class GMR_Handlers;
+}  // namespace google_opensource
 }  // namespace upb
 
 namespace protobuf {
@@ -287,9 +287,9 @@ class LIBPROTOBUF_EXPORT GeneratedMessageReflection : public Reflection {
  private:
   friend class GeneratedMessage;
 
-  // To parse directly into a proto2 generated class, FieldAccessor needs
-  // access to member offsets and hasbits.
-  friend class LIBPROTOBUF_EXPORT upb::proto2_bridge_opensource::FieldAccessor;
+  // To parse directly into a proto2 generated class, the class GMR_Handlers
+  // needs access to member offsets and hasbits.
+  friend class LIBPROTOBUF_EXPORT upb::google_opensource::GMR_Handlers;
 
   const Descriptor* descriptor_;
   const Message* default_instance_;