diff --git a/php/ext/google/protobuf/php-upb.h b/php/ext/google/protobuf/php-upb.h
index a8e5a0db31..83e492914f 100644
--- a/php/ext/google/protobuf/php-upb.h
+++ b/php/ext/google/protobuf/php-upb.h
@@ -3368,13 +3368,12 @@ UPB_API_INLINE bool upb_Message_SetInt64(struct upb_Message* msg,
 }
 
 // Sets the value of a message-typed field. The mini_tables of `msg` and
-// `sub_message` must have been linked for this to work correctly.
+// `value` must have been linked for this to work correctly.
 UPB_API_INLINE void upb_Message_SetMessage(struct upb_Message* msg,
-                                           const upb_MiniTable* m,
                                            const upb_MiniTableField* f,
-                                           struct upb_Message* sub_message) {
+                                           struct upb_Message* value) {
   UPB_PRIVATE(_upb_Message_SetTaggedMessagePtr)
-  (msg, f, UPB_PRIVATE(_upb_TaggedMessagePtr_Pack)(sub_message, false));
+  (msg, f, UPB_PRIVATE(_upb_TaggedMessagePtr_Pack)(value, false));
 }
 
 // Sets the value of a `string` or `bytes` field. The bytes of the value are not
@@ -3816,9 +3815,8 @@ UPB_API_INLINE bool upb_Message_SetInt64(upb_Message* msg,
                                          int64_t value, upb_Arena* a);
 
 UPB_API_INLINE void upb_Message_SetMessage(upb_Message* msg,
-                                           const upb_MiniTable* m,
                                            const upb_MiniTableField* f,
-                                           upb_Message* sub_message);
+                                           upb_Message* value);
 
 UPB_API_INLINE bool upb_Message_SetString(upb_Message* msg,
                                           const upb_MiniTableField* f,
diff --git a/ruby/ext/google/protobuf_c/ruby-upb.h b/ruby/ext/google/protobuf_c/ruby-upb.h
index 63ff2c9b8a..bb4c847a1a 100755
--- a/ruby/ext/google/protobuf_c/ruby-upb.h
+++ b/ruby/ext/google/protobuf_c/ruby-upb.h
@@ -3370,13 +3370,12 @@ UPB_API_INLINE bool upb_Message_SetInt64(struct upb_Message* msg,
 }
 
 // Sets the value of a message-typed field. The mini_tables of `msg` and
-// `sub_message` must have been linked for this to work correctly.
+// `value` must have been linked for this to work correctly.
 UPB_API_INLINE void upb_Message_SetMessage(struct upb_Message* msg,
-                                           const upb_MiniTable* m,
                                            const upb_MiniTableField* f,
-                                           struct upb_Message* sub_message) {
+                                           struct upb_Message* value) {
   UPB_PRIVATE(_upb_Message_SetTaggedMessagePtr)
-  (msg, f, UPB_PRIVATE(_upb_TaggedMessagePtr_Pack)(sub_message, false));
+  (msg, f, UPB_PRIVATE(_upb_TaggedMessagePtr_Pack)(value, false));
 }
 
 // Sets the value of a `string` or `bytes` field. The bytes of the value are not
@@ -3818,9 +3817,8 @@ UPB_API_INLINE bool upb_Message_SetInt64(upb_Message* msg,
                                          int64_t value, upb_Arena* a);
 
 UPB_API_INLINE void upb_Message_SetMessage(upb_Message* msg,
-                                           const upb_MiniTable* m,
                                            const upb_MiniTableField* f,
-                                           upb_Message* sub_message);
+                                           upb_Message* value);
 
 UPB_API_INLINE bool upb_Message_SetString(upb_Message* msg,
                                           const upb_MiniTableField* f,