diff --git a/feature/buildfeatures/buildfeatures.go b/feature/buildfeatures/buildfeatures.go
new file mode 100644
index 000000000..cdb31dc01
--- /dev/null
+++ b/feature/buildfeatures/buildfeatures.go
@@ -0,0 +1,10 @@
+// Copyright (c) Tailscale Inc & AUTHORS
+// SPDX-License-Identifier: BSD-3-Clause
+
+//go:generate go run gen.go
+
+// The buildfeatures package contains boolean constants indicating which
+// features were included in the binary (via build tags), for use in dead code
+// elimination when using separate build tag protected files is impractical
+// or undesirable.
+package buildfeatures
diff --git a/feature/featuretags/feature_aws_disabled.go b/feature/buildfeatures/feature_aws_disabled.go
similarity index 58%
rename from feature/featuretags/feature_aws_disabled.go
rename to feature/buildfeatures/feature_aws_disabled.go
index 045feb269..66b670c1f 100644
--- a/feature/featuretags/feature_aws_disabled.go
+++ b/feature/buildfeatures/feature_aws_disabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build ts_omit_aws
 
-package featuretags
+package buildfeatures
 
-// AWS is whether the binary was built with support for modular feature "AWS integration".
+// HasAWS is whether the binary was built with support for modular feature "AWS integration".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_aws" build tag.
 // It's a const so it can be used for dead code elimination.
-const AWS = false
+const HasAWS = false
diff --git a/feature/featuretags/feature_aws_enabled.go b/feature/buildfeatures/feature_aws_enabled.go
similarity index 58%
rename from feature/featuretags/feature_aws_enabled.go
rename to feature/buildfeatures/feature_aws_enabled.go
index d935c9d26..30203b2aa 100644
--- a/feature/featuretags/feature_aws_enabled.go
+++ b/feature/buildfeatures/feature_aws_enabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build !ts_omit_aws
 
-package featuretags
+package buildfeatures
 
-// AWS is whether the binary was built with support for modular feature "AWS integration".
+// HasAWS is whether the binary was built with support for modular feature "AWS integration".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_aws" build tag.
 // It's a const so it can be used for dead code elimination.
-const AWS = true
+const HasAWS = true
diff --git a/feature/featuretags/feature_bird_disabled.go b/feature/buildfeatures/feature_bird_disabled.go
similarity index 57%
rename from feature/featuretags/feature_bird_disabled.go
rename to feature/buildfeatures/feature_bird_disabled.go
index 986c98458..469aa41f9 100644
--- a/feature/featuretags/feature_bird_disabled.go
+++ b/feature/buildfeatures/feature_bird_disabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build ts_omit_bird
 
-package featuretags
+package buildfeatures
 
-// Bird is whether the binary was built with support for modular feature "Bird BGP integration".
+// HasBird is whether the binary was built with support for modular feature "Bird BGP integration".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_bird" build tag.
 // It's a const so it can be used for dead code elimination.
-const Bird = false
+const HasBird = false
diff --git a/feature/featuretags/feature_bird_enabled.go b/feature/buildfeatures/feature_bird_enabled.go
similarity index 58%
rename from feature/featuretags/feature_bird_enabled.go
rename to feature/buildfeatures/feature_bird_enabled.go
index ac9404704..792129f64 100644
--- a/feature/featuretags/feature_bird_enabled.go
+++ b/feature/buildfeatures/feature_bird_enabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build !ts_omit_bird
 
-package featuretags
+package buildfeatures
 
-// Bird is whether the binary was built with support for modular feature "Bird BGP integration".
+// HasBird is whether the binary was built with support for modular feature "Bird BGP integration".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_bird" build tag.
 // It's a const so it can be used for dead code elimination.
-const Bird = true
+const HasBird = true
diff --git a/feature/featuretags/feature_capture_disabled.go b/feature/buildfeatures/feature_capture_disabled.go
similarity index 58%
rename from feature/featuretags/feature_capture_disabled.go
rename to feature/buildfeatures/feature_capture_disabled.go
index cee424542..58535958f 100644
--- a/feature/featuretags/feature_capture_disabled.go
+++ b/feature/buildfeatures/feature_capture_disabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build ts_omit_capture
 
-package featuretags
+package buildfeatures
 
-// Capture is whether the binary was built with support for modular feature "Packet capture".
+// HasCapture is whether the binary was built with support for modular feature "Packet capture".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_capture" build tag.
 // It's a const so it can be used for dead code elimination.
-const Capture = false
+const HasCapture = false
diff --git a/feature/featuretags/feature_capture_enabled.go b/feature/buildfeatures/feature_capture_enabled.go
similarity index 58%
rename from feature/featuretags/feature_capture_enabled.go
rename to feature/buildfeatures/feature_capture_enabled.go
index 40aabf110..7120a3d06 100644
--- a/feature/featuretags/feature_capture_enabled.go
+++ b/feature/buildfeatures/feature_capture_enabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build !ts_omit_capture
 
-package featuretags
+package buildfeatures
 
-// Capture is whether the binary was built with support for modular feature "Packet capture".
+// HasCapture is whether the binary was built with support for modular feature "Packet capture".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_capture" build tag.
 // It's a const so it can be used for dead code elimination.
-const Capture = true
+const HasCapture = true
diff --git a/feature/featuretags/feature_completion_disabled.go b/feature/buildfeatures/feature_completion_disabled.go
similarity index 57%
rename from feature/featuretags/feature_completion_disabled.go
rename to feature/buildfeatures/feature_completion_disabled.go
index 7b3f3cb6d..ea319beb0 100644
--- a/feature/featuretags/feature_completion_disabled.go
+++ b/feature/buildfeatures/feature_completion_disabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build ts_omit_completion
 
-package featuretags
+package buildfeatures
 
-// Completion is whether the binary was built with support for modular feature "CLI shell completion".
+// HasCompletion is whether the binary was built with support for modular feature "CLI shell completion".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_completion" build tag.
 // It's a const so it can be used for dead code elimination.
-const Completion = false
+const HasCompletion = false
diff --git a/feature/featuretags/feature_completion_enabled.go b/feature/buildfeatures/feature_completion_enabled.go
similarity index 57%
rename from feature/featuretags/feature_completion_enabled.go
rename to feature/buildfeatures/feature_completion_enabled.go
index b6d5218f2..6db41c97b 100644
--- a/feature/featuretags/feature_completion_enabled.go
+++ b/feature/buildfeatures/feature_completion_enabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build !ts_omit_completion
 
-package featuretags
+package buildfeatures
 
-// Completion is whether the binary was built with support for modular feature "CLI shell completion".
+// HasCompletion is whether the binary was built with support for modular feature "CLI shell completion".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_completion" build tag.
 // It's a const so it can be used for dead code elimination.
-const Completion = true
+const HasCompletion = true
diff --git a/feature/featuretags/feature_debugeventbus_disabled.go b/feature/buildfeatures/feature_debugeventbus_disabled.go
similarity index 57%
rename from feature/featuretags/feature_debugeventbus_disabled.go
rename to feature/buildfeatures/feature_debugeventbus_disabled.go
index c826de691..2eb599934 100644
--- a/feature/featuretags/feature_debugeventbus_disabled.go
+++ b/feature/buildfeatures/feature_debugeventbus_disabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build ts_omit_debugeventbus
 
-package featuretags
+package buildfeatures
 
-// DebugEventBus is whether the binary was built with support for modular feature "eventbus debug support".
+// HasDebugEventBus is whether the binary was built with support for modular feature "eventbus debug support".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_debugeventbus" build tag.
 // It's a const so it can be used for dead code elimination.
-const DebugEventBus = false
+const HasDebugEventBus = false
diff --git a/feature/featuretags/feature_debugeventbus_enabled.go b/feature/buildfeatures/feature_debugeventbus_enabled.go
similarity index 57%
rename from feature/featuretags/feature_debugeventbus_enabled.go
rename to feature/buildfeatures/feature_debugeventbus_enabled.go
index 068efa859..df13b6fa2 100644
--- a/feature/featuretags/feature_debugeventbus_enabled.go
+++ b/feature/buildfeatures/feature_debugeventbus_enabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build !ts_omit_debugeventbus
 
-package featuretags
+package buildfeatures
 
-// DebugEventBus is whether the binary was built with support for modular feature "eventbus debug support".
+// HasDebugEventBus is whether the binary was built with support for modular feature "eventbus debug support".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_debugeventbus" build tag.
 // It's a const so it can be used for dead code elimination.
-const DebugEventBus = true
+const HasDebugEventBus = true
diff --git a/feature/featuretags/feature_desktop_sessions_disabled.go b/feature/buildfeatures/feature_desktop_sessions_disabled.go
similarity index 56%
rename from feature/featuretags/feature_desktop_sessions_disabled.go
rename to feature/buildfeatures/feature_desktop_sessions_disabled.go
index 73644d911..1536c886f 100644
--- a/feature/featuretags/feature_desktop_sessions_disabled.go
+++ b/feature/buildfeatures/feature_desktop_sessions_disabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build ts_omit_desktop_sessions
 
-package featuretags
+package buildfeatures
 
-// DesktopSessions is whether the binary was built with support for modular feature "Desktop sessions support".
+// HasDesktopSessions is whether the binary was built with support for modular feature "Desktop sessions support".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_desktop_sessions" build tag.
 // It's a const so it can be used for dead code elimination.
-const DesktopSessions = false
+const HasDesktopSessions = false
diff --git a/feature/featuretags/feature_desktop_sessions_enabled.go b/feature/buildfeatures/feature_desktop_sessions_enabled.go
similarity index 57%
rename from feature/featuretags/feature_desktop_sessions_enabled.go
rename to feature/buildfeatures/feature_desktop_sessions_enabled.go
index 93c776a04..84658de95 100644
--- a/feature/featuretags/feature_desktop_sessions_enabled.go
+++ b/feature/buildfeatures/feature_desktop_sessions_enabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build !ts_omit_desktop_sessions
 
-package featuretags
+package buildfeatures
 
-// DesktopSessions is whether the binary was built with support for modular feature "Desktop sessions support".
+// HasDesktopSessions is whether the binary was built with support for modular feature "Desktop sessions support".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_desktop_sessions" build tag.
 // It's a const so it can be used for dead code elimination.
-const DesktopSessions = true
+const HasDesktopSessions = true
diff --git a/feature/featuretags/feature_drive_disabled.go b/feature/buildfeatures/feature_drive_disabled.go
similarity index 55%
rename from feature/featuretags/feature_drive_disabled.go
rename to feature/buildfeatures/feature_drive_disabled.go
index 550ed0bd1..072026389 100644
--- a/feature/featuretags/feature_drive_disabled.go
+++ b/feature/buildfeatures/feature_drive_disabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build ts_omit_drive
 
-package featuretags
+package buildfeatures
 
-// Drive is whether the binary was built with support for modular feature "Tailscale Drive (file server) support".
+// HasDrive is whether the binary was built with support for modular feature "Tailscale Drive (file server) support".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_drive" build tag.
 // It's a const so it can be used for dead code elimination.
-const Drive = false
+const HasDrive = false
diff --git a/feature/featuretags/feature_drive_enabled.go b/feature/buildfeatures/feature_drive_enabled.go
similarity index 55%
rename from feature/featuretags/feature_drive_enabled.go
rename to feature/buildfeatures/feature_drive_enabled.go
index 2ed83b271..9f58836a4 100644
--- a/feature/featuretags/feature_drive_enabled.go
+++ b/feature/buildfeatures/feature_drive_enabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build !ts_omit_drive
 
-package featuretags
+package buildfeatures
 
-// Drive is whether the binary was built with support for modular feature "Tailscale Drive (file server) support".
+// HasDrive is whether the binary was built with support for modular feature "Tailscale Drive (file server) support".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_drive" build tag.
 // It's a const so it can be used for dead code elimination.
-const Drive = true
+const HasDrive = true
diff --git a/feature/featuretags/feature_kube_disabled.go b/feature/buildfeatures/feature_kube_disabled.go
similarity index 57%
rename from feature/featuretags/feature_kube_disabled.go
rename to feature/buildfeatures/feature_kube_disabled.go
index 3a140e869..2b76c57e7 100644
--- a/feature/featuretags/feature_kube_disabled.go
+++ b/feature/buildfeatures/feature_kube_disabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build ts_omit_kube
 
-package featuretags
+package buildfeatures
 
-// Kube is whether the binary was built with support for modular feature "Kubernetes integration".
+// HasKube is whether the binary was built with support for modular feature "Kubernetes integration".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_kube" build tag.
 // It's a const so it can be used for dead code elimination.
-const Kube = false
+const HasKube = false
diff --git a/feature/featuretags/feature_kube_enabled.go b/feature/buildfeatures/feature_kube_enabled.go
similarity index 57%
rename from feature/featuretags/feature_kube_enabled.go
rename to feature/buildfeatures/feature_kube_enabled.go
index 1dd119a2b..7abca1759 100644
--- a/feature/featuretags/feature_kube_enabled.go
+++ b/feature/buildfeatures/feature_kube_enabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build !ts_omit_kube
 
-package featuretags
+package buildfeatures
 
-// Kube is whether the binary was built with support for modular feature "Kubernetes integration".
+// HasKube is whether the binary was built with support for modular feature "Kubernetes integration".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_kube" build tag.
 // It's a const so it can be used for dead code elimination.
-const Kube = true
+const HasKube = true
diff --git a/feature/featuretags/feature_relayserver_disabled.go b/feature/buildfeatures/feature_relayserver_disabled.go
similarity index 58%
rename from feature/featuretags/feature_relayserver_disabled.go
rename to feature/buildfeatures/feature_relayserver_disabled.go
index e6122ef9c..08ced8310 100644
--- a/feature/featuretags/feature_relayserver_disabled.go
+++ b/feature/buildfeatures/feature_relayserver_disabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build ts_omit_relayserver
 
-package featuretags
+package buildfeatures
 
-// RelayServer is whether the binary was built with support for modular feature "Relay server".
+// HasRelayServer is whether the binary was built with support for modular feature "Relay server".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_relayserver" build tag.
 // It's a const so it can be used for dead code elimination.
-const RelayServer = false
+const HasRelayServer = false
diff --git a/feature/featuretags/feature_relayserver_enabled.go b/feature/buildfeatures/feature_relayserver_enabled.go
similarity index 58%
rename from feature/featuretags/feature_relayserver_enabled.go
rename to feature/buildfeatures/feature_relayserver_enabled.go
index 34ed23a84..6a35f8305 100644
--- a/feature/featuretags/feature_relayserver_enabled.go
+++ b/feature/buildfeatures/feature_relayserver_enabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build !ts_omit_relayserver
 
-package featuretags
+package buildfeatures
 
-// RelayServer is whether the binary was built with support for modular feature "Relay server".
+// HasRelayServer is whether the binary was built with support for modular feature "Relay server".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_relayserver" build tag.
 // It's a const so it can be used for dead code elimination.
-const RelayServer = true
+const HasRelayServer = true
diff --git a/feature/featuretags/feature_serve_disabled.go b/feature/buildfeatures/feature_serve_disabled.go
similarity index 57%
rename from feature/featuretags/feature_serve_disabled.go
rename to feature/buildfeatures/feature_serve_disabled.go
index a143e951f..6d7971350 100644
--- a/feature/featuretags/feature_serve_disabled.go
+++ b/feature/buildfeatures/feature_serve_disabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build ts_omit_serve
 
-package featuretags
+package buildfeatures
 
-// Serve is whether the binary was built with support for modular feature "Serve and Funnel support".
+// HasServe is whether the binary was built with support for modular feature "Serve and Funnel support".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_serve" build tag.
 // It's a const so it can be used for dead code elimination.
-const Serve = false
+const HasServe = false
diff --git a/feature/featuretags/feature_serve_enabled.go b/feature/buildfeatures/feature_serve_enabled.go
similarity index 57%
rename from feature/featuretags/feature_serve_enabled.go
rename to feature/buildfeatures/feature_serve_enabled.go
index 1d1af0809..57bf2c6b0 100644
--- a/feature/featuretags/feature_serve_enabled.go
+++ b/feature/buildfeatures/feature_serve_enabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build !ts_omit_serve
 
-package featuretags
+package buildfeatures
 
-// Serve is whether the binary was built with support for modular feature "Serve and Funnel support".
+// HasServe is whether the binary was built with support for modular feature "Serve and Funnel support".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_serve" build tag.
 // It's a const so it can be used for dead code elimination.
-const Serve = true
+const HasServe = true
diff --git a/feature/featuretags/feature_ssh_disabled.go b/feature/buildfeatures/feature_ssh_disabled.go
similarity index 57%
rename from feature/featuretags/feature_ssh_disabled.go
rename to feature/buildfeatures/feature_ssh_disabled.go
index c22be2945..754f50eb6 100644
--- a/feature/featuretags/feature_ssh_disabled.go
+++ b/feature/buildfeatures/feature_ssh_disabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build ts_omit_ssh
 
-package featuretags
+package buildfeatures
 
-// SSH is whether the binary was built with support for modular feature "Tailscale SSH support".
+// HasSSH is whether the binary was built with support for modular feature "Tailscale SSH support".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_ssh" build tag.
 // It's a const so it can be used for dead code elimination.
-const SSH = false
+const HasSSH = false
diff --git a/feature/featuretags/feature_ssh_enabled.go b/feature/buildfeatures/feature_ssh_enabled.go
similarity index 58%
rename from feature/featuretags/feature_ssh_enabled.go
rename to feature/buildfeatures/feature_ssh_enabled.go
index 52fa10b58..dbdc3a89f 100644
--- a/feature/featuretags/feature_ssh_enabled.go
+++ b/feature/buildfeatures/feature_ssh_enabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build !ts_omit_ssh
 
-package featuretags
+package buildfeatures
 
-// SSH is whether the binary was built with support for modular feature "Tailscale SSH support".
+// HasSSH is whether the binary was built with support for modular feature "Tailscale SSH support".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_ssh" build tag.
 // It's a const so it can be used for dead code elimination.
-const SSH = true
+const HasSSH = true
diff --git a/feature/featuretags/feature_syspolicy_disabled.go b/feature/buildfeatures/feature_syspolicy_disabled.go
similarity index 54%
rename from feature/featuretags/feature_syspolicy_disabled.go
rename to feature/buildfeatures/feature_syspolicy_disabled.go
index db73b0261..54d32e32e 100644
--- a/feature/featuretags/feature_syspolicy_disabled.go
+++ b/feature/buildfeatures/feature_syspolicy_disabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build ts_omit_syspolicy
 
-package featuretags
+package buildfeatures
 
-// SystemPolicy is whether the binary was built with support for modular feature "System policy configuration (MDM) support".
+// HasSystemPolicy is whether the binary was built with support for modular feature "System policy configuration (MDM) support".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_syspolicy" build tag.
 // It's a const so it can be used for dead code elimination.
-const SystemPolicy = false
+const HasSystemPolicy = false
diff --git a/feature/featuretags/feature_syspolicy_enabled.go b/feature/buildfeatures/feature_syspolicy_enabled.go
similarity index 54%
rename from feature/featuretags/feature_syspolicy_enabled.go
rename to feature/buildfeatures/feature_syspolicy_enabled.go
index 2ad332676..f7c403ae9 100644
--- a/feature/featuretags/feature_syspolicy_enabled.go
+++ b/feature/buildfeatures/feature_syspolicy_enabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build !ts_omit_syspolicy
 
-package featuretags
+package buildfeatures
 
-// SystemPolicy is whether the binary was built with support for modular feature "System policy configuration (MDM) support".
+// HasSystemPolicy is whether the binary was built with support for modular feature "System policy configuration (MDM) support".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_syspolicy" build tag.
 // It's a const so it can be used for dead code elimination.
-const SystemPolicy = true
+const HasSystemPolicy = true
diff --git a/feature/featuretags/feature_systray_disabled.go b/feature/buildfeatures/feature_systray_disabled.go
similarity index 58%
rename from feature/featuretags/feature_systray_disabled.go
rename to feature/buildfeatures/feature_systray_disabled.go
index a358bbf6f..4ae1edb0a 100644
--- a/feature/featuretags/feature_systray_disabled.go
+++ b/feature/buildfeatures/feature_systray_disabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build ts_omit_systray
 
-package featuretags
+package buildfeatures
 
-// SysTray is whether the binary was built with support for modular feature "Linux system tray".
+// HasSysTray is whether the binary was built with support for modular feature "Linux system tray".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_systray" build tag.
 // It's a const so it can be used for dead code elimination.
-const SysTray = false
+const HasSysTray = false
diff --git a/feature/featuretags/feature_systray_enabled.go b/feature/buildfeatures/feature_systray_enabled.go
similarity index 58%
rename from feature/featuretags/feature_systray_enabled.go
rename to feature/buildfeatures/feature_systray_enabled.go
index aebf3ad9e..5fd7fd220 100644
--- a/feature/featuretags/feature_systray_enabled.go
+++ b/feature/buildfeatures/feature_systray_enabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build !ts_omit_systray
 
-package featuretags
+package buildfeatures
 
-// SysTray is whether the binary was built with support for modular feature "Linux system tray".
+// HasSysTray is whether the binary was built with support for modular feature "Linux system tray".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_systray" build tag.
 // It's a const so it can be used for dead code elimination.
-const SysTray = true
+const HasSysTray = true
diff --git a/feature/featuretags/feature_taildrop_disabled.go b/feature/buildfeatures/feature_taildrop_disabled.go
similarity index 56%
rename from feature/featuretags/feature_taildrop_disabled.go
rename to feature/buildfeatures/feature_taildrop_disabled.go
index 5c95c28b6..8ffe90617 100644
--- a/feature/featuretags/feature_taildrop_disabled.go
+++ b/feature/buildfeatures/feature_taildrop_disabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build ts_omit_taildrop
 
-package featuretags
+package buildfeatures
 
-// Taildrop is whether the binary was built with support for modular feature "Taildrop (file sending) support".
+// HasTaildrop is whether the binary was built with support for modular feature "Taildrop (file sending) support".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_taildrop" build tag.
 // It's a const so it can be used for dead code elimination.
-const Taildrop = false
+const HasTaildrop = false
diff --git a/feature/featuretags/feature_taildrop_enabled.go b/feature/buildfeatures/feature_taildrop_enabled.go
similarity index 56%
rename from feature/featuretags/feature_taildrop_enabled.go
rename to feature/buildfeatures/feature_taildrop_enabled.go
index e5212f03a..4f55d2801 100644
--- a/feature/featuretags/feature_taildrop_enabled.go
+++ b/feature/buildfeatures/feature_taildrop_enabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build !ts_omit_taildrop
 
-package featuretags
+package buildfeatures
 
-// Taildrop is whether the binary was built with support for modular feature "Taildrop (file sending) support".
+// HasTaildrop is whether the binary was built with support for modular feature "Taildrop (file sending) support".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_taildrop" build tag.
 // It's a const so it can be used for dead code elimination.
-const Taildrop = true
+const HasTaildrop = true
diff --git a/feature/featuretags/feature_tailnetlock_disabled.go b/feature/buildfeatures/feature_tailnetlock_disabled.go
similarity index 57%
rename from feature/featuretags/feature_tailnetlock_disabled.go
rename to feature/buildfeatures/feature_tailnetlock_disabled.go
index 2a07233de..6b5a57f24 100644
--- a/feature/featuretags/feature_tailnetlock_disabled.go
+++ b/feature/buildfeatures/feature_tailnetlock_disabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build ts_omit_tailnetlock
 
-package featuretags
+package buildfeatures
 
-// TailnetLock is whether the binary was built with support for modular feature "Tailnet Lock support".
+// HasTailnetLock is whether the binary was built with support for modular feature "Tailnet Lock support".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_tailnetlock" build tag.
 // It's a const so it can be used for dead code elimination.
-const TailnetLock = false
+const HasTailnetLock = false
diff --git a/feature/featuretags/feature_tailnetlock_enabled.go b/feature/buildfeatures/feature_tailnetlock_enabled.go
similarity index 57%
rename from feature/featuretags/feature_tailnetlock_enabled.go
rename to feature/buildfeatures/feature_tailnetlock_enabled.go
index 1abf0c3bc..afedb7faa 100644
--- a/feature/featuretags/feature_tailnetlock_enabled.go
+++ b/feature/buildfeatures/feature_tailnetlock_enabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build !ts_omit_tailnetlock
 
-package featuretags
+package buildfeatures
 
-// TailnetLock is whether the binary was built with support for modular feature "Tailnet Lock support".
+// HasTailnetLock is whether the binary was built with support for modular feature "Tailnet Lock support".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_tailnetlock" build tag.
 // It's a const so it can be used for dead code elimination.
-const TailnetLock = true
+const HasTailnetLock = true
diff --git a/feature/featuretags/feature_tap_disabled.go b/feature/buildfeatures/feature_tap_disabled.go
similarity index 55%
rename from feature/featuretags/feature_tap_disabled.go
rename to feature/buildfeatures/feature_tap_disabled.go
index d4dfded2b..f0b3eec8d 100644
--- a/feature/featuretags/feature_tap_disabled.go
+++ b/feature/buildfeatures/feature_tap_disabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build ts_omit_tap
 
-package featuretags
+package buildfeatures
 
-// Tap is whether the binary was built with support for modular feature "Experimental Layer 2 (ethernet) support".
+// HasTap is whether the binary was built with support for modular feature "Experimental Layer 2 (ethernet) support".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_tap" build tag.
 // It's a const so it can be used for dead code elimination.
-const Tap = false
+const HasTap = false
diff --git a/feature/featuretags/feature_tap_enabled.go b/feature/buildfeatures/feature_tap_enabled.go
similarity index 55%
rename from feature/featuretags/feature_tap_enabled.go
rename to feature/buildfeatures/feature_tap_enabled.go
index a6ce1415c..1363c4b44 100644
--- a/feature/featuretags/feature_tap_enabled.go
+++ b/feature/buildfeatures/feature_tap_enabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build !ts_omit_tap
 
-package featuretags
+package buildfeatures
 
-// Tap is whether the binary was built with support for modular feature "Experimental Layer 2 (ethernet) support".
+// HasTap is whether the binary was built with support for modular feature "Experimental Layer 2 (ethernet) support".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_tap" build tag.
 // It's a const so it can be used for dead code elimination.
-const Tap = true
+const HasTap = true
diff --git a/feature/featuretags/feature_tpm_disabled.go b/feature/buildfeatures/feature_tpm_disabled.go
similarity index 59%
rename from feature/featuretags/feature_tpm_disabled.go
rename to feature/buildfeatures/feature_tpm_disabled.go
index 15d888cfe..b9d55815e 100644
--- a/feature/featuretags/feature_tpm_disabled.go
+++ b/feature/buildfeatures/feature_tpm_disabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build ts_omit_tpm
 
-package featuretags
+package buildfeatures
 
-// TPM is whether the binary was built with support for modular feature "TPM support".
+// HasTPM is whether the binary was built with support for modular feature "TPM support".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_tpm" build tag.
 // It's a const so it can be used for dead code elimination.
-const TPM = false
+const HasTPM = false
diff --git a/feature/featuretags/feature_tpm_enabled.go b/feature/buildfeatures/feature_tpm_enabled.go
similarity index 59%
rename from feature/featuretags/feature_tpm_enabled.go
rename to feature/buildfeatures/feature_tpm_enabled.go
index 3525f744c..dcfc8a304 100644
--- a/feature/featuretags/feature_tpm_enabled.go
+++ b/feature/buildfeatures/feature_tpm_enabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build !ts_omit_tpm
 
-package featuretags
+package buildfeatures
 
-// TPM is whether the binary was built with support for modular feature "TPM support".
+// HasTPM is whether the binary was built with support for modular feature "TPM support".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_tpm" build tag.
 // It's a const so it can be used for dead code elimination.
-const TPM = true
+const HasTPM = true
diff --git a/feature/featuretags/feature_wakeonlan_disabled.go b/feature/buildfeatures/feature_wakeonlan_disabled.go
similarity index 57%
rename from feature/featuretags/feature_wakeonlan_disabled.go
rename to feature/buildfeatures/feature_wakeonlan_disabled.go
index 7b2b39c44..816ac661f 100644
--- a/feature/featuretags/feature_wakeonlan_disabled.go
+++ b/feature/buildfeatures/feature_wakeonlan_disabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build ts_omit_wakeonlan
 
-package featuretags
+package buildfeatures
 
-// WakeOnLAN is whether the binary was built with support for modular feature "Wake-on-LAN support".
+// HasWakeOnLAN is whether the binary was built with support for modular feature "Wake-on-LAN support".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_wakeonlan" build tag.
 // It's a const so it can be used for dead code elimination.
-const WakeOnLAN = false
+const HasWakeOnLAN = false
diff --git a/feature/featuretags/feature_wakeonlan_enabled.go b/feature/buildfeatures/feature_wakeonlan_enabled.go
similarity index 57%
rename from feature/featuretags/feature_wakeonlan_enabled.go
rename to feature/buildfeatures/feature_wakeonlan_enabled.go
index 87eed5abf..34b3348a1 100644
--- a/feature/featuretags/feature_wakeonlan_enabled.go
+++ b/feature/buildfeatures/feature_wakeonlan_enabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build !ts_omit_wakeonlan
 
-package featuretags
+package buildfeatures
 
-// WakeOnLAN is whether the binary was built with support for modular feature "Wake-on-LAN support".
+// HasWakeOnLAN is whether the binary was built with support for modular feature "Wake-on-LAN support".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_wakeonlan" build tag.
 // It's a const so it can be used for dead code elimination.
-const WakeOnLAN = true
+const HasWakeOnLAN = true
diff --git a/feature/featuretags/feature_webclient_disabled.go b/feature/buildfeatures/feature_webclient_disabled.go
similarity index 57%
rename from feature/featuretags/feature_webclient_disabled.go
rename to feature/buildfeatures/feature_webclient_disabled.go
index d49cbf8a7..a7b24f4ac 100644
--- a/feature/featuretags/feature_webclient_disabled.go
+++ b/feature/buildfeatures/feature_webclient_disabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build ts_omit_webclient
 
-package featuretags
+package buildfeatures
 
-// WebClient is whether the binary was built with support for modular feature "Web client support".
+// HasWebClient is whether the binary was built with support for modular feature "Web client support".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_webclient" build tag.
 // It's a const so it can be used for dead code elimination.
-const WebClient = false
+const HasWebClient = false
diff --git a/feature/featuretags/feature_webclient_enabled.go b/feature/buildfeatures/feature_webclient_enabled.go
similarity index 57%
rename from feature/featuretags/feature_webclient_enabled.go
rename to feature/buildfeatures/feature_webclient_enabled.go
index 020ff64a0..e40dad33c 100644
--- a/feature/featuretags/feature_webclient_enabled.go
+++ b/feature/buildfeatures/feature_webclient_enabled.go
@@ -1,13 +1,13 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code generated by gen-featuretags.go; DO NOT EDIT.
+// Code generated by gen.go; DO NOT EDIT.
 
 //go:build !ts_omit_webclient
 
-package featuretags
+package buildfeatures
 
-// WebClient is whether the binary was built with support for modular feature "Web client support".
+// HasWebClient is whether the binary was built with support for modular feature "Web client support".
 // Specifically, it's whether the binary was NOT built with the "ts_omit_webclient" build tag.
 // It's a const so it can be used for dead code elimination.
-const WebClient = true
+const HasWebClient = true
diff --git a/feature/featuretags/gen-featuretags.go b/feature/buildfeatures/gen.go
similarity index 80%
rename from feature/featuretags/gen-featuretags.go
rename to feature/buildfeatures/gen.go
index 27701fb78..e967cb8ff 100644
--- a/feature/featuretags/gen-featuretags.go
+++ b/feature/buildfeatures/gen.go
@@ -3,7 +3,7 @@
 
 //go:build ignore
 
-// The gen-featuretags.go program generates the feature_<feature>_enabled.go
+// The gens.go program generates the feature_<feature>_enabled.go
 // and feature_<feature>_disabled.go files for each feature tag.
 package main
 
@@ -20,7 +20,7 @@ import (
 const header = `// Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-// Code g|e|n|e|r|a|t|e|d by gen-featuretags.go; D|O N|OT E|D|I|T.
+// Code g|e|n|e|r|a|t|e|d by gen.go; D|O N|OT E|D|I|T.
 
 `
 
@@ -30,14 +30,14 @@ func main() {
 		if !k.IsOmittable() {
 			continue
 		}
-		sym := cmp.Or(m.Sym, strings.ToUpper(string(k)[:1])+string(k)[1:])
+		sym := "Has" + cmp.Or(m.Sym, strings.ToUpper(string(k)[:1])+string(k)[1:])
 		for _, suf := range []string{"enabled", "disabled"} {
 			bang := ""
 			if suf == "enabled" {
 				bang = "!" // !ts_omit_...
 			}
 			must.Do(os.WriteFile("feature_"+string(k)+"_"+suf+".go",
-				fmt.Appendf(nil, "%s//go:build %s%s\n\npackage featuretags\n\n"+
+				fmt.Appendf(nil, "%s//go:build %s%s\n\npackage buildfeatures\n\n"+
 					"// %s is whether the binary was built with support for modular feature %q.\n"+
 					"// Specifically, it's whether the binary was NOT built with the %q build tag.\n"+
 					"// It's a const so it can be used for dead code elimination.\n"+
diff --git a/feature/featuretags/featuretags.go b/feature/featuretags/featuretags.go
index 55945075b..6778593fa 100644
--- a/feature/featuretags/featuretags.go
+++ b/feature/featuretags/featuretags.go
@@ -1,8 +1,6 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-//go:generate go run gen-featuretags.go
-
 // The featuretags package is a registry of all the ts_omit-able build tags.
 package featuretags