diff --git a/ipn/ipnstate/ipnstate.go b/ipn/ipnstate/ipnstate.go
index 19192dfa6..34cc8ae24 100644
--- a/ipn/ipnstate/ipnstate.go
+++ b/ipn/ipnstate/ipnstate.go
@@ -111,11 +111,11 @@ type TKAPeer struct {
 // along with details about the locally-known state of the tailnet
 // key authority.
 type NetworkLockStatus struct {
-	// Enabled is true if network lock is enabled.
+	// Enabled is true if tailnet lock is enabled.
 	Enabled bool
 
 	// Head describes the AUM hash of the leaf AUM. Head is nil
-	// if network lock is not enabled.
+	// if tailnet lock is not enabled.
 	Head *[32]byte
 
 	// PublicKey describes the node's tailnet-lock public key.
@@ -145,9 +145,9 @@ type NetworkLockStatus struct {
 	// checks.
 	FilteredPeers []*TKAPeer
 
-	// StateID is a nonce associated with the network lock authority,
+	// StateID is a nonce associated with the tailnet lock authority,
 	// generated upon enablement. This field is not populated if the
-	// network lock is disabled.
+	// tailnet lock is disabled.
 	StateID uint64
 }
 
diff --git a/tailcfg/tka.go b/tailcfg/tka.go
index f392e6fd3..50678cde9 100644
--- a/tailcfg/tka.go
+++ b/tailcfg/tka.go
@@ -111,7 +111,7 @@ type TKABootstrapRequest struct {
 	NodeKey key.NodePublic
 
 	// Head represents the node's head AUMHash (tka.Authority.Head), if
-	// network lock is enabled.
+	// tailnet lock is enabled.
 	Head string
 }
 
diff --git a/tka/sig_test.go b/tka/sig_test.go
index 700967af2..04e9189a5 100644
--- a/tka/sig_test.go
+++ b/tka/sig_test.go
@@ -303,7 +303,7 @@ func TestSigSerializeUnserialize(t *testing.T) {
 }
 
 func TestNodeKeySignatureRotationDetails(t *testing.T) {
-	// Trusted network lock key
+	// Trusted tailnet lock key
 	pub, priv := testingKey25519(t, 1)
 	k := Key{Kind: Key25519, Public: pub, Votes: 2}
 
diff --git a/tsconst/tsconst.go b/tsconst/tsconst.go
index 85f05e549..1477bafec 100644
--- a/tsconst/tsconst.go
+++ b/tsconst/tsconst.go
@@ -10,6 +10,6 @@
 const WintunInterfaceDesc = "Tailscale Tunnel"
 const WintunInterfaceDesc0_14 = "Wintun Userspace Tunnel"
 
-// TailnetLockNotTrustedMsg is the error message used by network lock
+// TailnetLockNotTrustedMsg is the error message used by tailnet lock
 // and sniffed (via substring) out of an error sent over the network.
-const TailnetLockNotTrustedMsg = "this node is not trusted by network lock"
+const TailnetLockNotTrustedMsg = "this node is not trusted by Tailnet Lock"
diff --git a/tstest/integration/integration.go b/tstest/integration/integration.go
index b1903cb29..6b6df74c1 100644
--- a/tstest/integration/integration.go
+++ b/tstest/integration/integration.go
@@ -1130,7 +1130,7 @@ type StatusOutput struct{
 	return st.Self.PublicKey
 }
 
-// NLPublicKey returns the hex-encoded network lock public key of
+// NLPublicKey returns the hex-encoded tailnet lock public key of
 // this node, e.g. `tlpub:123456abc`
 func (n *TestNode) NLPublicKey() string {
 	tb := n.env.t
diff --git a/types/persist/persist.go b/types/persist/persist.go
index 2a8c2fb82..51b045359 100644
--- a/types/persist/persist.go
+++ b/types/persist/persist.go
@@ -29,7 +29,7 @@ type Persist struct {
 	AttestationKey    key.HardwareAttestationKey `json:",omitzero"`
 
 	// DisallowedTKAStateIDs stores the tka.State.StateID values which
-	// this node will not operate network lock on. This is used to
+	// this node will not operate tailnet lock on. This is used to
 	// prevent bootstrapping TKA onto a key authority which was forcibly
 	// disabled.
 	DisallowedTKAStateIDs []string `json:",omitempty"`
diff --git a/types/persist/persist_view.go b/types/persist/persist_view.go
index f33d222c6..b935808dc 100644
--- a/types/persist/persist_view.go
+++ b/types/persist/persist_view.go
@@ -96,7 +96,7 @@ func (v PersistView) NodeID() tailcfg.StableNodeID         { return v.ж.NodeID
 func (v PersistView) AttestationKey() tailcfg.StableNodeID { panic("unsupported") }
 
 // DisallowedTKAStateIDs stores the tka.State.StateID values which
-// this node will not operate network lock on. This is used to
+// this node will not operate tailnet lock on. This is used to
 // prevent bootstrapping TKA onto a key authority which was forcibly
 // disabled.
 func (v PersistView) DisallowedTKAStateIDs() views.Slice[string] {