diff --git a/build-support/build.zig b/build-support/build.zig
index 314b99f..bc1db57 100644
--- a/build-support/build.zig
+++ b/build-support/build.zig
@@ -63,8 +63,8 @@ const module_homes = [_]ModuleHome{
     .{ .name = "pci-class", .home = "device" },
     .{ .name = "device-registry", .home = "device" },
     // library/client — userspace service clients.
-    .{ .name = "display", .home = "client" },
-    .{ .name = "input", .home = "client" },
+    .{ .name = "display-client", .home = "client" },
+    .{ .name = "input-client", .home = "client" },
     // library/protocol — the wire protocols.
     .{ .name = "vfs-protocol", .home = "protocol" },
     .{ .name = "input-protocol", .home = "protocol" },
diff --git a/library/client/build.zig b/library/client/build.zig
index ed6420c..96e4b01 100644
--- a/library/client/build.zig
+++ b/library/client/build.zig
@@ -1,5 +1,8 @@
 //! The "client" library domain (library/client): userspace-service clients —
-//! they talk to services over IPC, not to the kernel.
+//! they talk to services over IPC, not to the kernel. Client modules end in
+//! `-client` the way wire protocols end in `-protocol`, so a service, its
+//! protocol, and its client never share a name (`display` the service,
+//! `display-protocol` the wire contract, `display-client` a program's view).
 
 const std = @import("std");
 
@@ -10,16 +13,16 @@ pub fn build(b: *std.Build) void {
     const ipc = kernel.module("ipc");
     const time = kernel.module("time");
 
-    _ = b.addModule("display", .{
-        .root_source_file = b.path("display/display.zig"),
+    _ = b.addModule("display-client", .{
+        .root_source_file = b.path("display/display-client.zig"),
         .imports = &.{
             .{ .name = "ipc", .module = ipc },
             .{ .name = "time", .module = time },
             .{ .name = "display-protocol", .module = protocol.module("display-protocol") },
         },
     });
-    _ = b.addModule("input", .{
-        .root_source_file = b.path("input/input.zig"),
+    _ = b.addModule("input-client", .{
+        .root_source_file = b.path("input/input-client.zig"),
         .imports = &.{
             .{ .name = "ipc", .module = ipc },
             .{ .name = "time", .module = time },
diff --git a/library/client/display/display.zig b/library/client/display/display-client.zig
similarity index 100%
rename from library/client/display/display.zig
rename to library/client/display/display-client.zig
diff --git a/library/client/input/input.zig b/library/client/input/input-client.zig
similarity index 100%
rename from library/client/input/input.zig
rename to library/client/input/input-client.zig
diff --git a/system/drivers/ps2-bus/build.zig b/system/drivers/ps2-bus/build.zig
index ecf1c60..05e2889 100644
--- a/system/drivers/ps2-bus/build.zig
+++ b/system/drivers/ps2-bus/build.zig
@@ -17,7 +17,7 @@ pub fn build(b: *std.Build) void {
         .name = "ps2-keyboard",
         .root_source_file = b.path("keyboard.zig"),
         .imports = &.{
-            "acpi-ids", "driver", "input", "input-protocol", "ipc", "logging", "memory",
+            "acpi-ids", "driver", "input-client", "input-protocol", "ipc", "logging", "memory",
             "process", "time", "xkeyboard-config",
         },
     });
@@ -27,7 +27,7 @@ pub fn build(b: *std.Build) void {
         .name = "ps2-mouse",
         .root_source_file = b.path("mouse.zig"),
         .imports = &.{
-            "acpi-ids", "driver", "input", "input-protocol", "ipc", "logging", "memory",
+            "acpi-ids", "driver", "input-client", "input-protocol", "ipc", "logging", "memory",
             "process", "time",
         },
     });
diff --git a/system/drivers/ps2-bus/keyboard.zig b/system/drivers/ps2-bus/keyboard.zig
index 809fb5c..602195b 100644
--- a/system/drivers/ps2-bus/keyboard.zig
+++ b/system/drivers/ps2-bus/keyboard.zig
@@ -19,7 +19,7 @@ const device = @import("driver");
 const ipc = @import("ipc");
 const process = @import("process");
 const time = @import("time");
-const input = @import("input");
+const input = @import("input-client");
 const memory = @import("memory");
 const logging = @import("logging");
 const xkb = @import("xkeyboard-config");
diff --git a/system/drivers/ps2-bus/mouse.zig b/system/drivers/ps2-bus/mouse.zig
index d05f866..1dc416a 100644
--- a/system/drivers/ps2-bus/mouse.zig
+++ b/system/drivers/ps2-bus/mouse.zig
@@ -19,7 +19,7 @@ const device = @import("driver");
 const ipc = @import("ipc");
 const process = @import("process");
 const time = @import("time");
-const input = @import("input");
+const input = @import("input-client");
 const memory = @import("memory");
 const logging = @import("logging");
 const ps2 = @import("ps2-library.zig");
diff --git a/system/drivers/usb-hid/build.zig b/system/drivers/usb-hid/build.zig
index 4de2064..aac0f10 100644
--- a/system/drivers/usb-hid/build.zig
+++ b/system/drivers/usb-hid/build.zig
@@ -10,8 +10,8 @@ pub fn build(b: *std.Build) void {
         .name = "usb-hid-keyboard",
         .root_source_file = b.path("keyboard.zig"),
         .imports = &.{
-            "driver", "input", "input-protocol", "ipc", "logging", "process", "service", "usb",
-            "usb-abi", "xkeyboard-config",
+            "driver", "input-client", "input-protocol", "ipc", "logging", "process", "service",
+            "usb", "usb-abi", "xkeyboard-config",
         },
     });
     b.installArtifact(usb_hid_keyboard_exe);
@@ -20,8 +20,8 @@ pub fn build(b: *std.Build) void {
         .name = "usb-hid-mouse",
         .root_source_file = b.path("mouse.zig"),
         .imports = &.{
-            "driver", "input", "input-protocol", "ipc", "logging", "process", "service", "usb",
-            "usb-abi",
+            "driver", "input-client", "input-protocol", "ipc", "logging", "process", "service",
+            "usb", "usb-abi",
         },
     });
     b.installArtifact(usb_hid_mouse_exe);
diff --git a/system/drivers/usb-hid/keyboard.zig b/system/drivers/usb-hid/keyboard.zig
index b7e08d3..21b305d 100644
--- a/system/drivers/usb-hid/keyboard.zig
+++ b/system/drivers/usb-hid/keyboard.zig
@@ -18,7 +18,7 @@ const std = @import("std");
 const ipc = @import("ipc");
 const process = @import("process");
 const service = @import("service");
-const input = @import("input");
+const input = @import("input-client");
 const device_manager = @import("driver");
 const logging = @import("logging");
 const usb = @import("usb");
diff --git a/system/drivers/usb-hid/mouse.zig b/system/drivers/usb-hid/mouse.zig
index 5a5f0f9..7dc26a5 100644
--- a/system/drivers/usb-hid/mouse.zig
+++ b/system/drivers/usb-hid/mouse.zig
@@ -14,7 +14,7 @@ const std = @import("std");
 const ipc = @import("ipc");
 const process = @import("process");
 const service = @import("service");
-const input = @import("input");
+const input = @import("input-client");
 const device_manager = @import("driver");
 const logging = @import("logging");
 const usb = @import("usb");
diff --git a/system/drivers/usb-xhci-bus/build.zig b/system/drivers/usb-xhci-bus/build.zig
index f28d5b1..5379364 100644
--- a/system/drivers/usb-xhci-bus/build.zig
+++ b/system/drivers/usb-xhci-bus/build.zig
@@ -10,8 +10,9 @@ pub fn build(b: *std.Build) void {
         .name = "usb-xhci-bus",
         .root_source_file = b.path("usb-xhci-bus.zig"),
         .imports = &.{
-            "device-manager-protocol", "driver", "input", "ipc", "logging", "memory", "mmio",
-            "pci", "process", "service", "time", "usb-abi", "usb-ids", "usb-transfer-protocol",
+            "device-manager-protocol", "driver", "input-client", "ipc", "logging", "memory",
+            "mmio", "pci", "process", "service", "time", "usb-abi", "usb-ids",
+            "usb-transfer-protocol",
         },
     });
     b.installArtifact(exe);
diff --git a/system/drivers/usb-xhci-bus/usb-xhci-bus.zig b/system/drivers/usb-xhci-bus/usb-xhci-bus.zig
index 7639dd3..d516e72 100644
--- a/system/drivers/usb-xhci-bus/usb-xhci-bus.zig
+++ b/system/drivers/usb-xhci-bus/usb-xhci-bus.zig
@@ -19,7 +19,7 @@ const ipc = @import("ipc");
 const process = @import("process");
 const service = @import("service");
 const time = @import("time");
-const input = @import("input");
+const input = @import("input-client");
 const device_manager = @import("driver");
 const memory = @import("memory");
 const logging = @import("logging");
diff --git a/system/services/display-demo/build.zig b/system/services/display-demo/build.zig
index 4fcb6cb..2c74ccb 100644
--- a/system/services/display-demo/build.zig
+++ b/system/services/display-demo/build.zig
@@ -9,7 +9,7 @@ pub fn build(b: *std.Build) void {
     const exe = build_support.userBinary(b, .{
         .name = "display-demo",
         .root_source_file = b.path("display-demo.zig"),
-        .imports = &.{ "display", "logging", "time" },
+        .imports = &.{ "display-client", "logging", "time" },
     });
     b.installArtifact(exe);
 }
diff --git a/system/services/display-demo/display-demo.zig b/system/services/display-demo/display-demo.zig
index 2075b61..979a6ab 100644
--- a/system/services/display-demo/display-demo.zig
+++ b/system/services/display-demo/display-demo.zig
@@ -11,7 +11,7 @@
 //! is deliberately independent of the mouse.
 
 
-const display = @import("display");
+const display = @import("display-client");
 const time = @import("time");
 const logging = @import("logging");
 pub fn main() void {
diff --git a/system/services/display/build.zig b/system/services/display/build.zig
index 547088b..600ae8e 100644
--- a/system/services/display/build.zig
+++ b/system/services/display/build.zig
@@ -10,8 +10,8 @@ pub fn build(b: *std.Build) void {
         .name = "display",
         .root_source_file = b.path("display.zig"),
         .imports = &.{
-            "display", "display-protocol", "driver", "input", "ipc", "logging", "memory",
-            "scanout-protocol", "service", "thread", "time",
+            "display-client", "display-protocol", "driver", "input-client", "ipc", "logging",
+            "memory", "scanout-protocol", "service", "thread", "time",
         },
         .threaded = true, // real atomics/TLS (docs/threading.md)
     });
diff --git a/system/services/display/display.zig b/system/services/display/display.zig
index 2710967..5370db7 100644
--- a/system/services/display/display.zig
+++ b/system/services/display/display.zig
@@ -17,11 +17,11 @@
 
 const std = @import("std");
 const ipc = @import("ipc");
-const input = @import("input");
+const input = @import("input-client");
 const Thread = @import("thread").Thread;
 const service = @import("service");
 const time = @import("time");
-const display = @import("display");
+const display = @import("display-client");
 const memory = @import("memory");
 const logging = @import("logging");
 const compositor = @import("compositor.zig");
diff --git a/system/services/input/build.zig b/system/services/input/build.zig
index b26291f..1568339 100644
--- a/system/services/input/build.zig
+++ b/system/services/input/build.zig
@@ -9,7 +9,7 @@ pub fn build(b: *std.Build) void {
     const exe = build_support.userBinary(b, .{
         .name = "input",
         .root_source_file = b.path("input.zig"),
-        .imports = &.{ "input", "input-protocol", "ipc", "logging", "process", "service" },
+        .imports = &.{ "input-client", "input-protocol", "ipc", "logging", "process", "service" },
     });
     b.installArtifact(exe);
 }
diff --git a/system/services/input/input.zig b/system/services/input/input.zig
index 3174af2..3f06358 100644
--- a/system/services/input/input.zig
+++ b/system/services/input/input.zig
@@ -23,7 +23,7 @@ const std = @import("std");
 const ipc = @import("ipc");
 const process = @import("process");
 const service = @import("service");
-const input = @import("input");
+const input = @import("input-client");
 const logging = @import("logging");
 const input_protocol = @import("input-protocol");
 
diff --git a/test/system/services/input-source/build.zig b/test/system/services/input-source/build.zig
index 99be147..689c1f5 100644
--- a/test/system/services/input-source/build.zig
+++ b/test/system/services/input-source/build.zig
@@ -9,7 +9,7 @@ pub fn build(b: *std.Build) void {
     const exe = build_support.userBinary(b, .{
         .name = "input-source",
         .root_source_file = b.path("input-source.zig"),
-        .imports = &.{ "input", "logging", "process", "time" },
+        .imports = &.{ "input-client", "logging", "process", "time" },
     });
     b.installArtifact(exe);
 }
diff --git a/test/system/services/input-source/input-source.zig b/test/system/services/input-source/input-source.zig
index 449020d..319a2f0 100644
--- a/test/system/services/input-source/input-source.zig
+++ b/test/system/services/input-source/input-source.zig
@@ -11,7 +11,7 @@
 //! decoded hardware is a follow-up (see docs/input.md).
 
 const std = @import("std");
-const input = @import("input");
+const input = @import("input-client");
 const process = @import("process");
 const time = @import("time");
 const logging = @import("logging");
diff --git a/test/system/services/input-test/build.zig b/test/system/services/input-test/build.zig
index 8550f01..0a3caa5 100644
--- a/test/system/services/input-test/build.zig
+++ b/test/system/services/input-test/build.zig
@@ -9,7 +9,7 @@ pub fn build(b: *std.Build) void {
     const exe = build_support.userBinary(b, .{
         .name = "input-test",
         .root_source_file = b.path("input-test.zig"),
-        .imports = &.{ "input", "logging" },
+        .imports = &.{ "input-client", "logging" },
     });
     b.installArtifact(exe);
 }
diff --git a/test/system/services/input-test/input-test.zig b/test/system/services/input-test/input-test.zig
index 93220a7..662486e 100644
--- a/test/system/services/input-test/input-test.zig
+++ b/test/system/services/input-test/input-test.zig
@@ -7,7 +7,7 @@
 //! device classes to one subscription — source -> service -> subscriber, per device.
 
 const std = @import("std");
-const input = @import("input");
+const input = @import("input-client");
 const logging = @import("logging");
 
 fn writeLine(comptime fmt: []const u8, arguments: anytype) void {