diff --git a/pw_snapshot/docs.rst b/pw_snapshot/docs.rst
index 8379271..fcf2ebb 100644
--- a/pw_snapshot/docs.rst
+++ b/pw_snapshot/docs.rst
@@ -30,7 +30,7 @@
 Life of a Snapshot
 ------------------
 A "snapshot" is just a `proto message
-<https://cs.opensource.google/pigweed/pigweed/+/master:pw_snapshot/pw_snapshot_protos/snapshot.proto>`_
+<https://cs.opensource.google/pigweed/pigweed/+/HEAD:pw_snapshot/pw_snapshot_protos/snapshot.proto>`_
 with many optional fields that describe a device's state at the time the
 snapshot was captured. The serialized proto can then be stored and transfered
 like a file so it can be analyzed at a later time.
diff --git a/pw_snapshot/pw_snapshot_protos/snapshot.proto b/pw_snapshot/pw_snapshot_protos/snapshot.proto
index 2da872d..e09c637 100644
--- a/pw_snapshot/pw_snapshot_protos/snapshot.proto
+++ b/pw_snapshot/pw_snapshot_protos/snapshot.proto
@@ -23,7 +23,7 @@
 import "pw_thread_protos/thread.proto";
 import "pw_snapshot_metadata_proto/snapshot_metadata.proto";
 
-// The Snapshot proto is a master list that dictates field numbers that should
+// The Snapshot proto is a list that dictates field numbers that should
 // be used when serializing proto messages into a "Snapshot" that can be
 // ingested by Pigweed's upstream tooling.
 //
diff --git a/pw_status/docs.rst b/pw_status/docs.rst
index a6434bf..45c3975 100644
--- a/pw_status/docs.rst
+++ b/pw_status/docs.rst
@@ -13,12 +13,12 @@
 object that wraps a status code.
 
 ``pw::Status`` uses Google's standard status codes (see the `Google APIs
-repository <https://github.com/googleapis/googleapis/blob/master/google/rpc/code.proto>`_).
+repository <https://github.com/googleapis/googleapis/blob/HEAD/google/rpc/code.proto>`_).
 These codes are used extensively in Google projects including `Abseil
 <https://abseil.io>`_ (`status/status.h
-<https://cs.opensource.google/abseil/abseil-cpp/+/master:absl/status/status.h>`_
+<https://cs.opensource.google/abseil/abseil-cpp/+/HEAD:absl/status/status.h>`_
 ) and `gRPC <https://grpc.io>`_ (`doc/statuscodes.md
-<https://github.com/grpc/grpc/blob/master/doc/statuscodes.md>`_).
+<https://github.com/grpc/grpc/blob/HEAD/doc/statuscodes.md>`_).
 
 An OK ``Status`` is created by the ``pw::OkStatus`` function or by the default
 ``Status`` constructor.  Non-OK ``Status`` is created with a static member