diff --git a/modules/video_coding/generic_decoder.cc b/modules/video_coding/generic_decoder.cc
index 753d6d9a03..166ce1d9f1 100644
--- a/modules/video_coding/generic_decoder.cc
+++ b/modules/video_coding/generic_decoder.cc
@@ -238,11 +238,11 @@ void VCMDecodedFrameCallback::Decoded(VideoFrame& decodedImage,
 
   decodedImage.set_timestamp_us(
       frame_info->render_time ? frame_info->render_time->us() : -1);
-  _receiveCallback->FrameToRender({.video_frame = decodedImage,
-                                   .qp = qp,
-                                   .decode_time = decode_time,
-                                   .content_type = frame_info->content_type,
-                                   .frame_type = frame_info->frame_type});
+  _receiveCallback->OnFrameToRender({.video_frame = decodedImage,
+                                     .qp = qp,
+                                     .decode_time = decode_time,
+                                     .content_type = frame_info->content_type,
+                                     .frame_type = frame_info->frame_type});
 }
 
 void VCMDecodedFrameCallback::OnDecoderInfoChanged(
diff --git a/modules/video_coding/generic_decoder_unittest.cc b/modules/video_coding/generic_decoder_unittest.cc
index 1700c931bb..9f362e45c6 100644
--- a/modules/video_coding/generic_decoder_unittest.cc
+++ b/modules/video_coding/generic_decoder_unittest.cc
@@ -56,14 +56,14 @@ class ReceiveCallback : public VCMReceiveCallback {
                         TimeDelta decode_time,
                         VideoContentType content_type,
                         VideoFrameType frame_type) override {
-    return FrameToRender({.video_frame = frame,
-                          .qp = qp,
-                          .decode_time = decode_time,
-                          .content_type = content_type,
-                          .frame_type = frame_type});
+    return OnFrameToRender({.video_frame = frame,
+                            .qp = qp,
+                            .decode_time = decode_time,
+                            .content_type = content_type,
+                            .frame_type = frame_type});
   }
 
-  int32_t FrameToRender(const struct FrameToRender& arguments) override {
+  int32_t OnFrameToRender(const struct FrameToRender& arguments) override {
     frames_.push_back(arguments.video_frame);
     return 0;
   }
diff --git a/modules/video_coding/include/video_coding_defines.h b/modules/video_coding/include/video_coding_defines.h
index c7f85a7765..1347431087 100644
--- a/modules/video_coding/include/video_coding_defines.h
+++ b/modules/video_coding/include/video_coding_defines.h
@@ -67,8 +67,9 @@ class VCMReceiveCallback {
                                 TimeDelta decode_time,
                                 VideoContentType content_type,
                                 VideoFrameType frame_type) = 0;
+
   // TODO: bugs.webrtc.org/358039777 - Make this pure virtual.
-  virtual int32_t FrameToRender(const struct FrameToRender& arguments) {
+  virtual int32_t OnFrameToRender(const struct FrameToRender& arguments) {
     return FrameToRender(arguments.video_frame, arguments.qp,
                          arguments.decode_time, arguments.content_type,
                          arguments.frame_type);
diff --git a/modules/video_coding/video_receiver2_unittest.cc b/modules/video_coding/video_receiver2_unittest.cc
index 27c8bfb7b3..1ceba0c9b4 100644
--- a/modules/video_coding/video_receiver2_unittest.cc
+++ b/modules/video_coding/video_receiver2_unittest.cc
@@ -50,7 +50,7 @@ class MockVCMReceiveCallback : public VCMReceiveCallback {
                VideoFrameType),
               (override));
   MOCK_METHOD(int32_t,
-              FrameToRender,
+              OnFrameToRender,
               (const struct FrameToRender&),
               (override));
   MOCK_METHOD(void, OnIncomingPayloadType, (int), (override));
diff --git a/modules/video_coding/video_receiver_unittest.cc b/modules/video_coding/video_receiver_unittest.cc
index 7e21a5c4da..eab7fa6aef 100644
--- a/modules/video_coding/video_receiver_unittest.cc
+++ b/modules/video_coding/video_receiver_unittest.cc
@@ -55,7 +55,7 @@ class MockVCMReceiveCallback : public VCMReceiveCallback {
                VideoFrameType),
               (override));
   MOCK_METHOD(int32_t,
-              FrameToRender,
+              OnFrameToRender,
               (const struct FrameToRender&),
               (override));
   MOCK_METHOD(void, OnIncomingPayloadType, (int), (override));
diff --git a/video/video_stream_decoder2.cc b/video/video_stream_decoder2.cc
index 1f5ef42fcf..c8bec277f0 100644
--- a/video/video_stream_decoder2.cc
+++ b/video/video_stream_decoder2.cc
@@ -55,13 +55,13 @@ int32_t VideoStreamDecoder::FrameToRender(VideoFrame& video_frame,
                                           TimeDelta decode_time,
                                           VideoContentType content_type,
                                           VideoFrameType frame_type) {
-  return FrameToRender({.video_frame = video_frame,
-                        .qp = qp,
-                        .decode_time = decode_time,
-                        .content_type = content_type,
-                        .frame_type = frame_type});
+  return OnFrameToRender({.video_frame = video_frame,
+                          .qp = qp,
+                          .decode_time = decode_time,
+                          .content_type = content_type,
+                          .frame_type = frame_type});
 }
-int32_t VideoStreamDecoder::FrameToRender(
+int32_t VideoStreamDecoder::OnFrameToRender(
     const struct FrameToRender& arguments) {
   receive_stats_callback_->OnDecodedFrame(
       arguments.video_frame, arguments.qp, arguments.decode_time,
diff --git a/video/video_stream_decoder2.h b/video/video_stream_decoder2.h
index 8a89e32ae7..df73cf4cbf 100644
--- a/video/video_stream_decoder2.h
+++ b/video/video_stream_decoder2.h
@@ -51,7 +51,7 @@ class VideoStreamDecoder : public VCMReceiveCallback {
                         TimeDelta decode_time,
                         VideoContentType content_type,
                         VideoFrameType frame_type) override;
-  int32_t FrameToRender(const struct FrameToRender& arguments) override;
+  int32_t OnFrameToRender(const struct FrameToRender& arguments) override;
   void OnDroppedFrames(uint32_t frames_dropped) override;
   void OnIncomingPayloadType(int payload_type) override;
   void OnDecoderInfoChanged(