diff --git a/apps/macos/Sources/Clawdis/MasterDiscoveryMenu.swift b/apps/macos/Sources/Clawdis/MasterDiscoveryMenu.swift
index 1470496b0..a095999d8 100644
--- a/apps/macos/Sources/Clawdis/MasterDiscoveryMenu.swift
+++ b/apps/macos/Sources/Clawdis/MasterDiscoveryMenu.swift
@@ -6,7 +6,7 @@ struct MasterDiscoveryInlineList: View {
     var discovery: MasterDiscoveryModel
     var currentTarget: String?
     var onSelect: (MasterDiscoveryModel.DiscoveredMaster) -> Void
-    @State private var hoveredMasterID: MasterDiscoveryModel.DiscoveredMaster.ID?
+    @State private var hoveredGatewayID: MasterDiscoveryModel.DiscoveredMaster.ID?
 
     var body: some View {
         VStack(alignment: .leading, spacing: 6) {
@@ -25,19 +25,19 @@ struct MasterDiscoveryInlineList: View {
                     .foregroundStyle(.secondary)
             } else {
                 VStack(alignment: .leading, spacing: 6) {
-                    ForEach(self.discovery.masters.prefix(6)) { master in
-                        let target = self.suggestedSSHTarget(master)
+                    ForEach(self.discovery.masters.prefix(6)) { gateway in
+                        let target = self.suggestedSSHTarget(gateway)
                         let selected = target != nil && self.currentTarget?
                             .trimmingCharacters(in: .whitespacesAndNewlines) == target
 
                         Button {
                             withAnimation(.spring(response: 0.25, dampingFraction: 0.9)) {
-                                self.onSelect(master)
+                                self.onSelect(gateway)
                             }
                         } label: {
                             HStack(alignment: .center, spacing: 10) {
                                 VStack(alignment: .leading, spacing: 2) {
-                                    Text(master.displayName)
+                                    Text(gateway.displayName)
                                         .font(.callout.weight(.semibold))
                                         .lineLimit(1)
                                         .truncationMode(.tail)
@@ -65,7 +65,7 @@ struct MasterDiscoveryInlineList: View {
                                 RoundedRectangle(cornerRadius: 10, style: .continuous)
                                     .fill(self.rowBackground(
                                         selected: selected,
-                                        hovered: self.hoveredMasterID == master.id)))
+                                        hovered: self.hoveredGatewayID == gateway.id)))
                             .overlay(
                                 RoundedRectangle(cornerRadius: 10, style: .continuous)
                                     .strokeBorder(
@@ -75,8 +75,8 @@ struct MasterDiscoveryInlineList: View {
                         }
                         .buttonStyle(.plain)
                         .onHover { hovering in
-                            self.hoveredMasterID = hovering ? master
-                                .id : (self.hoveredMasterID == master.id ? nil : self.hoveredMasterID)
+                            self.hoveredGatewayID = hovering ? gateway
+                                .id : (self.hoveredGatewayID == gateway.id ? nil : self.hoveredGatewayID)
                         }
                     }
                 }
@@ -89,13 +89,13 @@ struct MasterDiscoveryInlineList: View {
         .help("Click a discovered master to fill the SSH target.")
     }
 
-    private func suggestedSSHTarget(_ master: MasterDiscoveryModel.DiscoveredMaster) -> String? {
-        let host = master.tailnetDns ?? master.lanHost
+    private func suggestedSSHTarget(_ gateway: MasterDiscoveryModel.DiscoveredMaster) -> String? {
+        let host = gateway.tailnetDns ?? gateway.lanHost
         guard let host else { return nil }
         let user = NSUserName()
         var target = "\(user)@\(host)"
-        if master.sshPort != 22 {
-            target += ":\(master.sshPort)"
+        if gateway.sshPort != 22 {
+            target += ":\(gateway.sshPort)"
         }
         return target
     }
@@ -118,8 +118,8 @@ struct MasterDiscoveryMenu: View {
                 Button(self.discovery.statusText) {}
                     .disabled(true)
             } else {
-                ForEach(self.discovery.masters) { master in
-                    Button(master.displayName) { self.onSelect(master) }
+                ForEach(self.discovery.masters) { gateway in
+                    Button(gateway.displayName) { self.onSelect(gateway) }
                 }
             }
         } label: {
diff --git a/apps/macos/Sources/Clawdis/MasterDiscoveryModel.swift b/apps/macos/Sources/Clawdis/MasterDiscoveryModel.swift
index 3a547d63b..128468d35 100644
--- a/apps/macos/Sources/Clawdis/MasterDiscoveryModel.swift
+++ b/apps/macos/Sources/Clawdis/MasterDiscoveryModel.swift
@@ -4,8 +4,8 @@ import Observation
 
 // We use “master” as the on-the-wire service name; keep the model aligned with the protocol/docs.
 @MainActor
-// swiftlint:disable:next inclusive_language
 @Observable
+// swiftlint:disable:next inclusive_language
 final class MasterDiscoveryModel {
     // swiftlint:disable:next inclusive_language
     struct DiscoveredMaster: Identifiable, Equatable {
diff --git a/apps/macos/Sources/Clawdis/Onboarding.swift b/apps/macos/Sources/Clawdis/Onboarding.swift
index c0a0b7b5f..abf4a1e1a 100644
--- a/apps/macos/Sources/Clawdis/Onboarding.swift
+++ b/apps/macos/Sources/Clawdis/Onboarding.swift
@@ -213,7 +213,8 @@ struct OnboardingView: View {
                                 "The connected AI agent (e.g. Claude) can trigger powerful actions on your Mac, " +
                                     "including running commands, reading/writing files, and capturing screenshots — " +
                                     "depending on the permissions you grant.\n\n" +
-                                    "Only enable Clawdis if you understand the risks and trust the prompts and integrations you use.")
+                                    "Only enable Clawdis if you understand the risks and trust the prompts and " +
+                                    "integrations you use.")
                                 .font(.subheadline)
                                 .foregroundStyle(.secondary)
                                 .fixedSize(horizontal: false, vertical: true)
@@ -529,8 +530,10 @@ struct OnboardingView: View {
                 }
 
                 Text(
-                    "This writes your identity to `~/.clawdis/clawdis.json` and into `AGENTS.md` inside the workspace. " +
-                        "Treat that workspace as the agent’s “memory” and consider making it a (private) git repo.")
+                    "This writes your identity to `~/.clawdis/clawdis.json` and into `AGENTS.md` " +
+                        "inside the workspace. " +
+                        "Treat that workspace as the agent’s “memory” and consider making it a (private) git " +
+                        "repo.")
                     .font(.caption)
                     .foregroundStyle(.secondary)
                     .fixedSize(horizontal: false, vertical: true)