diff --git a/common_video/frame_instrumentation_data.h b/common_video/frame_instrumentation_data.h
index 49a5e66787..290688d473 100644
--- a/common_video/frame_instrumentation_data.h
+++ b/common_video/frame_instrumentation_data.h
@@ -15,7 +15,7 @@
 
 namespace webrtc {
 
-// TODO: b/358039777 - Error handling: negative values etc.
+// TODO: bugs.webrtc.org/358039777 - Error handling: negative values etc.
 struct FrameInstrumentationSyncData {
   int sequence_index;
   bool communicate_upper_bits;
diff --git a/media/engine/webrtc_video_engine.cc b/media/engine/webrtc_video_engine.cc
index 314ab18581..1a44a47105 100644
--- a/media/engine/webrtc_video_engine.cc
+++ b/media/engine/webrtc_video_engine.cc
@@ -1495,7 +1495,8 @@ bool WebRtcVideoSendChannel::AddSendStream(const StreamParams& sp) {
       bitrate_allocator_factory_;
   config.encoder_settings.encoder_switch_request_callback = this;
 
-  // TODO: b/358039777 - Add test when this effectively does something.
+  // TODO: bugs.webrtc.org/358039777 - Add test when this effectively does
+  // something.
   if (webrtc::RtpExtension::FindHeaderExtensionByUri(
           config.rtp.extensions, webrtc::RtpExtension::kCorruptionDetectionUri,
           webrtc::RtpExtension::kRequireEncryptedExtension)) {
diff --git a/video/corruption_detection/frame_instrumentation_generator.cc b/video/corruption_detection/frame_instrumentation_generator.cc
index d0add00514..b4f03777ce 100644
--- a/video/corruption_detection/frame_instrumentation_generator.cc
+++ b/video/corruption_detection/frame_instrumentation_generator.cc
@@ -40,7 +40,8 @@ std::optional<FilterSettings> GetCorruptionFilterSettings(
     const EncodedImage& encoded_image,
     VideoCodecType video_codec_type,
     int layer_id) {
-  /* TODO: b/358039777 - Uncomment when parameters are available in EncodedImage
+  /* TODO: bugs.webrtc.org/358039777 - Uncomment when parameters are available
+     in EncodedImage.
   if (encoded_image.CorruptionDetectionParameters()) {
     return FilterSettings{
         .std_dev = encoded_image.CorruptionDetectionParameters()->std_dev,
@@ -136,7 +137,7 @@ FrameInstrumentationGenerator::OnEncodedImage(
     contexts_[layer_id].frame_sampler.SetCurrentIndex(sequence_index);
   }
 
-  // TODO: b/358039777 - Maybe allow other sample sizes as well
+  // TODO: bugs.webrtc.org/358039777 - Maybe allow other sample sizes as well
   std::vector<HaltonFrameSampler::Coordinates> sample_coordinates =
       contexts_[layer_id]
           .frame_sampler.GetSampleCoordinatesForFrameIfFrameShouldBeSampled(