diff --git a/pw_kvs/converts_to_span_test.cc b/pw_kvs/converts_to_span_test.cc
index 68fc5b2..35600f1 100644
--- a/pw_kvs/converts_to_span_test.cc
+++ b/pw_kvs/converts_to_span_test.cc
@@ -96,7 +96,7 @@
 static_assert(ConvertsToSpan<std::span<bool>&&>());
 
 // These tests for the make_span function were copied from Chromium:
-// https://chromium.googlesource.com/chromium/src/+/master/base/containers/span_unittest.cc
+// https://chromium.googlesource.com/chromium/src/+/main/base/containers/span_unittest.cc
 
 TEST(SpanTest, MakeSpanFromDataAndSize) {
   int* nullint = nullptr;
diff --git a/pw_kvs/public/pw_kvs/internal/span_traits.h b/pw_kvs/public/pw_kvs/internal/span_traits.h
index f85f0d6..afb0528 100644
--- a/pw_kvs/public/pw_kvs/internal/span_traits.h
+++ b/pw_kvs/public/pw_kvs/internal/span_traits.h
@@ -22,7 +22,7 @@
 
 // This borrows the `make_span` function from Chromium and uses to see if a type
 // can be represented as a span. See:
-// https://chromium.googlesource.com/chromium/src/+/master/base/containers/span.h
+// https://chromium.googlesource.com/chromium/src/+/main/base/containers/span.h
 
 // Simplified implementation of C++20's std::iter_reference_t.
 // As opposed to std::iter_reference_t, this implementation does not restrict