diff --git a/php/ext/google/protobuf/php-upb.h b/php/ext/google/protobuf/php-upb.h
index a9c187123b..00303e5fe5 100644
--- a/php/ext/google/protobuf/php-upb.h
+++ b/php/ext/google/protobuf/php-upb.h
@@ -2460,12 +2460,12 @@ UPB_INLINE bool UPB_PRIVATE(_upb_Message_ClearOneofCase)(
 
 // LINT.ThenChange(GoogleInternalName2)
 
-UPB_INLINE void* UPB_PRIVATE(_upb_Message_DataPtr)(
+UPB_INLINE void* UPB_PRIVATE(_upb_Message_MutableDataPtr)(
     struct upb_Message* msg, const upb_MiniTableField* f) {
   return (char*)msg + f->UPB_ONLYBITS(offset);
 }
 
-UPB_INLINE const void* UPB_PRIVATE(_upb_Message_ConstDataPtr)(
+UPB_INLINE const void* UPB_PRIVATE(_upb_Message_DataPtr)(
     const struct upb_Message* msg, const upb_MiniTableField* f) {
   return (const char*)msg + f->UPB_ONLYBITS(offset);
 }
@@ -2591,7 +2591,7 @@ static UPB_FORCEINLINE void _upb_Message_GetNonExtensionField(
     return;
   }
   UPB_PRIVATE(_upb_MiniTableField_DataCopy)
-  (field, val, UPB_PRIVATE(_upb_Message_ConstDataPtr)(msg, field));
+  (field, val, UPB_PRIVATE(_upb_Message_DataPtr)(msg, field));
 }
 
 UPB_INLINE void _upb_Message_GetExtensionField(
@@ -2639,7 +2639,7 @@ UPB_INLINE void _upb_Message_SetNonExtensionField(
   UPB_ASSUME(!upb_MiniTableField_IsExtension(field));
   UPB_PRIVATE(_upb_Message_SetPresence)(msg, field);
   UPB_PRIVATE(_upb_MiniTableField_DataCopy)
-  (field, UPB_PRIVATE(_upb_Message_DataPtr)(msg, field), val);
+  (field, UPB_PRIVATE(_upb_Message_MutableDataPtr)(msg, field), val);
 }
 
 UPB_INLINE bool _upb_Message_SetExtensionField(
@@ -2664,7 +2664,7 @@ UPB_INLINE void UPB_PRIVATE(_upb_Message_ClearBaseField)(
   }
   const char zeros[16] = {0};
   UPB_PRIVATE(_upb_MiniTableField_DataCopy)
-  (f, UPB_PRIVATE(_upb_Message_DataPtr)(msg, f), zeros);
+  (f, UPB_PRIVATE(_upb_Message_MutableDataPtr)(msg, f), zeros);
 }
 
 UPB_INLINE void UPB_PRIVATE(_upb_Message_ClearExtension)(
diff --git a/ruby/ext/google/protobuf_c/ruby-upb.h b/ruby/ext/google/protobuf_c/ruby-upb.h
index fb51f5f9b1..584acf1ead 100755
--- a/ruby/ext/google/protobuf_c/ruby-upb.h
+++ b/ruby/ext/google/protobuf_c/ruby-upb.h
@@ -2462,12 +2462,12 @@ UPB_INLINE bool UPB_PRIVATE(_upb_Message_ClearOneofCase)(
 
 // LINT.ThenChange(GoogleInternalName2)
 
-UPB_INLINE void* UPB_PRIVATE(_upb_Message_DataPtr)(
+UPB_INLINE void* UPB_PRIVATE(_upb_Message_MutableDataPtr)(
     struct upb_Message* msg, const upb_MiniTableField* f) {
   return (char*)msg + f->UPB_ONLYBITS(offset);
 }
 
-UPB_INLINE const void* UPB_PRIVATE(_upb_Message_ConstDataPtr)(
+UPB_INLINE const void* UPB_PRIVATE(_upb_Message_DataPtr)(
     const struct upb_Message* msg, const upb_MiniTableField* f) {
   return (const char*)msg + f->UPB_ONLYBITS(offset);
 }
@@ -2593,7 +2593,7 @@ static UPB_FORCEINLINE void _upb_Message_GetNonExtensionField(
     return;
   }
   UPB_PRIVATE(_upb_MiniTableField_DataCopy)
-  (field, val, UPB_PRIVATE(_upb_Message_ConstDataPtr)(msg, field));
+  (field, val, UPB_PRIVATE(_upb_Message_DataPtr)(msg, field));
 }
 
 UPB_INLINE void _upb_Message_GetExtensionField(
@@ -2641,7 +2641,7 @@ UPB_INLINE void _upb_Message_SetNonExtensionField(
   UPB_ASSUME(!upb_MiniTableField_IsExtension(field));
   UPB_PRIVATE(_upb_Message_SetPresence)(msg, field);
   UPB_PRIVATE(_upb_MiniTableField_DataCopy)
-  (field, UPB_PRIVATE(_upb_Message_DataPtr)(msg, field), val);
+  (field, UPB_PRIVATE(_upb_Message_MutableDataPtr)(msg, field), val);
 }
 
 UPB_INLINE bool _upb_Message_SetExtensionField(
@@ -2666,7 +2666,7 @@ UPB_INLINE void UPB_PRIVATE(_upb_Message_ClearBaseField)(
   }
   const char zeros[16] = {0};
   UPB_PRIVATE(_upb_MiniTableField_DataCopy)
-  (f, UPB_PRIVATE(_upb_Message_DataPtr)(msg, f), zeros);
+  (f, UPB_PRIVATE(_upb_Message_MutableDataPtr)(msg, f), zeros);
 }
 
 UPB_INLINE void UPB_PRIVATE(_upb_Message_ClearExtension)(