# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1678212640 -3600
# Node ID ec186bf44106023806842ee75c3c5db629c9717b
# Parent  4a5c85bf5bb21b6e44517bea4c6e9b5ab627465c
Introduced naming conventions for server capabilities.

diff -r 4a5c85bf5bb2 -r ec186bf44106 conf/dstest_block_client.cfg
--- a/conf/dstest_block_client.cfg	Tue Mar 07 16:44:43 2023 +0100
+++ b/conf/dstest_block_client.cfg	Tue Mar 07 19:10:40 2023 +0100
@@ -4,11 +4,11 @@
 
 local l = L4.default_loader;
 
-local server = l:new_channel();
+local block_server = l:new_channel();
 
 l:startv({
     caps = {
-      server = server:svr(),
+      fsserver = block_server:svr(),
     },
     log = { "server", "r" },
   },
@@ -16,7 +16,7 @@
 
 l:startv({
     caps = {
-      server = server,
+      fsserver = block_server,
     },
     log = { "client", "g" },
   },
diff -r 4a5c85bf5bb2 -r ec186bf44106 conf/dstest_block_client_simple.cfg
--- a/conf/dstest_block_client_simple.cfg	Tue Mar 07 16:44:43 2023 +0100
+++ b/conf/dstest_block_client_simple.cfg	Tue Mar 07 19:10:40 2023 +0100
@@ -4,11 +4,11 @@
 
 local l = L4.default_loader;
 
-local server = l:new_channel();
+local block_server = l:new_channel();
 
 l:startv({
     caps = {
-      server = server:svr(),
+      fsserver = block_server:svr(),
     },
     log = { "server", "r" },
   },
@@ -16,7 +16,7 @@
 
 l:startv({
     caps = {
-      server = server,
+      fsserver = block_server,
     },
     log = { "client", "g" },
   },
diff -r 4a5c85bf5bb2 -r ec186bf44106 conf/dstest_exec.cfg
--- a/conf/dstest_exec.cfg	Tue Mar 07 16:44:43 2023 +0100
+++ b/conf/dstest_exec.cfg	Tue Mar 07 19:10:40 2023 +0100
@@ -8,7 +8,7 @@
 
 l:startv({
     caps = {
-      server = pipe_server:svr(),
+      pipeserver = pipe_server:svr(),
     },
     log = { "pipes", "r" },
   },
@@ -18,35 +18,35 @@
 
 l:startv({
     caps = {
-      server = block_server:svr(),
+      fsserver = block_server:svr(),
     },
     log = { "blocks", "r" },
   },
   "rom/block_server", "10");
 
-local ext2svr = l:new_channel();
+local ext2server = l:new_channel();
 
 l:startv({
     caps = {
-      blocksvr = block_server,
-      pipes = pipe_server,
-      ext2svr = ext2svr:svr(),
+      blockserver = block_server,
+      pipeserver = pipe_server,
+      fsserver = ext2server:svr(),
     },
     log = { "ext2", "y" },
   },
-  "rom/ext2_server", "blocksvr", "rom/e2test.fs", "20", "ext2svr");
+  "rom/ext2_server", "blockserver", "rom/e2test.fs", "20", "fsserver");
 
 -- Obtain user filesystems with umask 0022 (18).
 
 local open_for_user = 6;
-local ext2svr_paulb = L4.cast(L4.Proto.Factory, ext2svr):create(open_for_user, 1000, 1000, 18);
+local ext2server_paulb = L4.cast(L4.Proto.Factory, ext2server):create(open_for_user, 1000, 1000, 18);
 
 local process_server = l:new_channel();
 
 l:startv({
     caps = {
-      server = ext2svr_paulb,
-      pserver = process_server:svr(),
+      fsserver = ext2server_paulb,
+      prserver = process_server:svr(),
     },
     log = { "process", "y" },
   },
@@ -54,8 +54,8 @@
 
 l:startv({
     caps = {
-      server = ext2svr_paulb,
-      pserver = process_server,
+      fsserver = ext2server_paulb,
+      prserver = process_server,
     },
     log = { "client", "g" },
   },
diff -r 4a5c85bf5bb2 -r ec186bf44106 conf/dstest_ext2.cfg
--- a/conf/dstest_ext2.cfg	Tue Mar 07 16:44:43 2023 +0100
+++ b/conf/dstest_ext2.cfg	Tue Mar 07 19:10:40 2023 +0100
@@ -4,35 +4,35 @@
 
 local l = L4.default_loader;
 
-local blocksvr = l:new_channel();
+local block_server = l:new_channel();
 
 l:startv({
     caps = {
-      server = blocksvr:svr(),
+      fsserver = block_server:svr(),
     },
     log = { "blocksvr", "r" },
   },
   "rom/block_server", "10");
 
-local ext2svr = l:new_channel();
+local ext2server = l:new_channel();
 
 l:startv({
     caps = {
-      blocksvr = blocksvr,
-      ext2svr = ext2svr:svr(),
+      blockserver = block_server,
+      fsserver = ext2server:svr(),
     },
     log = { "ext2svr", "y" },
   },
-  "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr");
+  "rom/ext2_server", "blockserver", "rom/e2test.fs", "10", "fsserver");
 
 -- Obtain user filesystems with umask 0022 (18).
 
 local open_for_user = 6;
-local ext2svr_paulb = L4.cast(L4.Proto.Factory, ext2svr):create(open_for_user, 1000, 1000, 18);
+local ext2server_paulb = L4.cast(L4.Proto.Factory, ext2server):create(open_for_user, 1000, 1000, 18);
 
 l:startv({
     caps = {
-      server = ext2svr_paulb,
+      fsserver = ext2server_paulb,
     },
     log = { "client", "g" },
   },
diff -r 4a5c85bf5bb2 -r ec186bf44106 conf/dstest_ext2fs_client.cfg
--- a/conf/dstest_ext2fs_client.cfg	Tue Mar 07 16:44:43 2023 +0100
+++ b/conf/dstest_ext2fs_client.cfg	Tue Mar 07 19:10:40 2023 +0100
@@ -4,11 +4,11 @@
 
 local l = L4.default_loader;
 
-local blocksvr = l:new_channel();
+local block_server = l:new_channel();
 
 l:startv({
     caps = {
-      server = blocksvr:svr(),
+      fsserver = block_server:svr(),
     },
     log = { "blocksvr", "r" },
   },
@@ -16,8 +16,8 @@
 
 l:startv({
     caps = {
-      server = blocksvr,
+      fsserver = block_server,
     },
     log = { "client", "g" },
   },
-  "rom/dstest_ext2fs_client", "server", "rom/e2test.fs");
+  "rom/dstest_ext2fs_client", "fsserver", "rom/e2test.fs");
diff -r 4a5c85bf5bb2 -r ec186bf44106 conf/dstest_file_access.cfg
--- a/conf/dstest_file_access.cfg	Tue Mar 07 16:44:43 2023 +0100
+++ b/conf/dstest_file_access.cfg	Tue Mar 07 19:10:40 2023 +0100
@@ -8,42 +8,42 @@
 
 l:startv({
     caps = {
-      server = pipe_server:svr(),
+      pipeserver = pipe_server:svr(),
     },
     log = { "pipes", "r" },
   },
   "rom/pipe_server", "10");
 
-local blocksvr = l:new_channel();
+local block_server = l:new_channel();
 
 l:startv({
     caps = {
-      server = blocksvr:svr(),
+      fsserver = block_server:svr(),
     },
     log = { "blocksvr", "r" },
   },
   "rom/block_server", "10");
 
-local ext2svr = l:new_channel();
+local ext2server = l:new_channel();
 
 l:startv({
     caps = {
-      blocksvr = blocksvr,
-      pipes = pipe_server,
-      ext2svr = ext2svr:svr(),
+      blockserver = block_server,
+      pipeserver = pipe_server,
+      fsserver = ext2server:svr(),
     },
     log = { "ext2svr", "y" },
   },
-  "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr");
+  "rom/ext2_server", "blockserver", "rom/e2test.fs", "10", "fsserver");
 
 -- Obtain user filesystems with umask 0022 (18).
 
 local open_for_user = 6;
-local ext2svr_davidb = L4.cast(L4.Proto.Factory, ext2svr):create(open_for_user, 1001, 1001, 18);
+local ext2server_davidb = L4.cast(L4.Proto.Factory, ext2server):create(open_for_user, 1001, 1001, 18);
 
 l:startv({
     caps = {
-      server = ext2svr_davidb,
+      fsserver = ext2server_davidb,
     },
     log = { "client", "g" },
   },
diff -r 4a5c85bf5bb2 -r ec186bf44106 conf/dstest_file_client.cfg
--- a/conf/dstest_file_client.cfg	Tue Mar 07 16:44:43 2023 +0100
+++ b/conf/dstest_file_client.cfg	Tue Mar 07 19:10:40 2023 +0100
@@ -4,35 +4,35 @@
 
 local l = L4.default_loader;
 
-local blocksvr = l:new_channel();
+local block_server = l:new_channel();
 
 l:startv({
     caps = {
-      server = blocksvr:svr(),
+      fsserver = block_server:svr(),
     },
     log = { "blocksvr", "r" },
   },
   "rom/block_server", "10");
 
-local ext2svr = l:new_channel();
+local ext2server = l:new_channel();
 
 l:startv({
     caps = {
-      blocksvr = blocksvr,
-      ext2svr = ext2svr:svr(),
+      blockserver = block_server,
+      fsserver = ext2server:svr(),
     },
     log = { "ext2svr", "y" },
   },
-  "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr");
+  "rom/ext2_server", "blockserver", "rom/e2test.fs", "10", "fsserver");
 
 -- Obtain user filesystems with umask 0022 (18).
 
 local open_for_user = 6;
-local ext2svr_paulb = L4.cast(L4.Proto.Factory, ext2svr):create(open_for_user, 1000, 1000, 18);
+local ext2server_paulb = L4.cast(L4.Proto.Factory, ext2server):create(open_for_user, 1000, 1000, 18);
 
 l:startv({
     caps = {
-      server = ext2svr_paulb,
+      fsserver = ext2server_paulb,
     },
     log = { "client", "g" },
   },
diff -r 4a5c85bf5bb2 -r ec186bf44106 conf/dstest_file_mapping.cfg
--- a/conf/dstest_file_mapping.cfg	Tue Mar 07 16:44:43 2023 +0100
+++ b/conf/dstest_file_mapping.cfg	Tue Mar 07 19:10:40 2023 +0100
@@ -4,11 +4,11 @@
 
 local l = L4.default_loader;
 
-local server = l:new_channel();
+local host_server = l:new_channel();
 
 l:startv({
     caps = {
-      server = server:svr(),
+      fsserver = host_server:svr(),
     },
     log = { "server", "r" },
   },
@@ -16,7 +16,7 @@
 
 l:startv({
     caps = {
-      server = server,
+      fsserver = host_server,
     },
     log = { "client", "g" },
   },
diff -r 4a5c85bf5bb2 -r ec186bf44106 conf/dstest_file_monitor.cfg
--- a/conf/dstest_file_monitor.cfg	Tue Mar 07 16:44:43 2023 +0100
+++ b/conf/dstest_file_monitor.cfg	Tue Mar 07 19:10:40 2023 +0100
@@ -4,35 +4,35 @@
 
 local l = L4.default_loader;
 
-local blocksvr = l:new_channel();
+local block_server = l:new_channel();
 
 l:startv({
     caps = {
-      server = blocksvr:svr(),
+      fsserver = block_server:svr(),
     },
     log = { "blocksvr", "r" },
   },
   "rom/block_server", "10");
 
-local ext2svr = l:new_channel();
+local ext2server = l:new_channel();
 
 l:startv({
     caps = {
-      blocksvr = blocksvr,
-      ext2svr = ext2svr:svr(),
+      blockserver = block_server,
+      fsserver = ext2server:svr(),
     },
     log = { "ext2svr", "y" },
   },
-  "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr");
+  "rom/ext2_server", "blockserver", "rom/e2test.fs", "10", "fsserver");
 
 -- Obtain user filesystems with umask 0022 (18).
 
 local open_for_user = 6;
-local ext2svr_paulb = L4.cast(L4.Proto.Factory, ext2svr):create(open_for_user, 1000, 1000, 18);
+local ext2server_paulb = L4.cast(L4.Proto.Factory, ext2server):create(open_for_user, 1000, 1000, 18);
 
 l:startv({
     caps = {
-      server = ext2svr_paulb,
+      fsserver = ext2server_paulb,
     },
     log = { "client", "g" },
   },
diff -r 4a5c85bf5bb2 -r ec186bf44106 conf/dstest_file_readdir.cfg
--- a/conf/dstest_file_readdir.cfg	Tue Mar 07 16:44:43 2023 +0100
+++ b/conf/dstest_file_readdir.cfg	Tue Mar 07 19:10:40 2023 +0100
@@ -8,7 +8,7 @@
 
 l:startv({
     caps = {
-      server = pipe_server:svr(),
+      pipeserver = pipe_server:svr(),
     },
     log = { "pipes", "r" },
   },
@@ -18,32 +18,32 @@
 
 l:startv({
     caps = {
-      server = block_server:svr(),
+      fsserver = block_server:svr(),
     },
     log = { "blocksvr", "r" },
   },
   "rom/block_server", "10");
 
-local ext2svr = l:new_channel();
+local ext2server = l:new_channel();
 
 l:startv({
     caps = {
-      blocksvr = block_server,
-      pipes = pipe_server,
-      ext2svr = ext2svr:svr(),
+      blockserver = block_server,
+      pipeserver = pipe_server,
+      fsserver = ext2server:svr(),
     },
     log = { "ext2svr", "y" },
   },
-  "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr");
+  "rom/ext2_server", "blockserver", "rom/e2test.fs", "10", "fsserver");
 
 -- Obtain user filesystems with umask 0022 (18).
 
 local open_for_user = 6;
-local ext2svr_paulb = L4.cast(L4.Proto.Factory, ext2svr):create(open_for_user, 1000, 1000, 18);
+local ext2server_paulb = L4.cast(L4.Proto.Factory, ext2server):create(open_for_user, 1000, 1000, 18);
 
 l:startv({
     caps = {
-      server = ext2svr_paulb,
+      fsserver = ext2server_paulb,
     },
     log = { "client", "g" },
   },
diff -r 4a5c85bf5bb2 -r ec186bf44106 conf/dstest_file_readdir_concurrent.cfg
--- a/conf/dstest_file_readdir_concurrent.cfg	Tue Mar 07 16:44:43 2023 +0100
+++ b/conf/dstest_file_readdir_concurrent.cfg	Tue Mar 07 19:10:40 2023 +0100
@@ -8,7 +8,7 @@
 
 l:startv({
     caps = {
-      server = pipe_server:svr(),
+      pipeserver = pipe_server:svr(),
     },
     log = { "pipes", "r" },
   },
@@ -18,32 +18,32 @@
 
 l:startv({
     caps = {
-      server = block_server:svr(),
+      fsserver = block_server:svr(),
     },
     log = { "blocksvr", "r" },
   },
   "rom/block_server", "10");
 
-local ext2svr = l:new_channel();
+local ext2server = l:new_channel();
 
 l:startv({
     caps = {
-      blocksvr = block_server,
-      pipes = pipe_server,
-      ext2svr = ext2svr:svr(),
+      blockserver = block_server,
+      pipeserver = pipe_server,
+      fsserver = ext2server:svr(),
     },
     log = { "ext2svr", "y" },
   },
-  "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr");
+  "rom/ext2_server", "blockserver", "rom/e2test.fs", "10", "fsserver");
 
 -- Obtain user filesystems with umask 0022 (18).
 
 local open_for_user = 6;
-local ext2svr_paulb = L4.cast(L4.Proto.Factory, ext2svr):create(open_for_user, 1000, 1000, 18);
+local ext2server_paulb = L4.cast(L4.Proto.Factory, ext2server):create(open_for_user, 1000, 1000, 18);
 
 l:startv({
     caps = {
-      server = ext2svr_paulb,
+      fsserver = ext2server_paulb,
     },
     log = { "client", "g" },
   },
diff -r 4a5c85bf5bb2 -r ec186bf44106 conf/dstest_file_remove.cfg
--- a/conf/dstest_file_remove.cfg	Tue Mar 07 16:44:43 2023 +0100
+++ b/conf/dstest_file_remove.cfg	Tue Mar 07 19:10:40 2023 +0100
@@ -8,7 +8,7 @@
 
 l:startv({
     caps = {
-      server = pipe_server:svr(),
+      pipeserver = pipe_server:svr(),
     },
     log = { "pipes", "r" },
   },
@@ -18,32 +18,32 @@
 
 l:startv({
     caps = {
-      server = block_server:svr(),
+      fsserver = block_server:svr(),
     },
     log = { "blocksvr", "r" },
   },
   "rom/block_server", "10");
 
-local ext2svr = l:new_channel();
+local ext2server = l:new_channel();
 
 l:startv({
     caps = {
-      blocksvr = block_server,
-      pipes = pipe_server,
-      ext2svr = ext2svr:svr(),
+      blockserver = block_server,
+      pipeserver = pipe_server,
+      fsserver = ext2server:svr(),
     },
     log = { "ext2svr", "y" },
   },
-  "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr");
+  "rom/ext2_server", "blockserver", "rom/e2test.fs", "10", "fsserver");
 
 -- Obtain user filesystems with umask 0022 (18).
 
 local open_for_user = 6;
-local ext2svr_paulb = L4.cast(L4.Proto.Factory, ext2svr):create(open_for_user, 1000, 1000, 18);
+local ext2server_paulb = L4.cast(L4.Proto.Factory, ext2server):create(open_for_user, 1000, 1000, 18);
 
 l:startv({
     caps = {
-      server = ext2svr_paulb,
+      fsserver = ext2server_paulb,
     },
     log = { "client", "g" },
   },
diff -r 4a5c85bf5bb2 -r ec186bf44106 conf/dstest_file_rename.cfg
--- a/conf/dstest_file_rename.cfg	Tue Mar 07 16:44:43 2023 +0100
+++ b/conf/dstest_file_rename.cfg	Tue Mar 07 19:10:40 2023 +0100
@@ -8,7 +8,7 @@
 
 l:startv({
     caps = {
-      server = pipe_server:svr(),
+      pipeserver = pipe_server:svr(),
     },
     log = { "pipes", "r" },
   },
@@ -18,32 +18,32 @@
 
 l:startv({
     caps = {
-      server = block_server:svr(),
+      fsserver = block_server:svr(),
     },
     log = { "blocksvr", "r" },
   },
   "rom/block_server", "10");
 
-local ext2svr = l:new_channel();
+local ext2server = l:new_channel();
 
 l:startv({
     caps = {
-      blocksvr = block_server,
-      pipes = pipe_server,
-      ext2svr = ext2svr:svr(),
+      blockserver = block_server,
+      pipeserver = pipe_server,
+      fsserver = ext2server:svr(),
     },
     log = { "ext2svr", "y" },
   },
-  "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr");
+  "rom/ext2_server", "blockserver", "rom/e2test.fs", "10", "fsserver");
 
 -- Obtain user filesystems with umask 0022 (18).
 
 local open_for_user = 6;
-local ext2svr_paulb = L4.cast(L4.Proto.Factory, ext2svr):create(open_for_user, 1000, 1000, 18);
+local ext2server_paulb = L4.cast(L4.Proto.Factory, ext2server):create(open_for_user, 1000, 1000, 18);
 
 l:startv({
     caps = {
-      server = ext2svr_paulb,
+      fsserver = ext2server_paulb,
     },
     log = { "client", "g" },
   },
diff -r 4a5c85bf5bb2 -r ec186bf44106 conf/dstest_fsaccess.cfg
--- a/conf/dstest_fsaccess.cfg	Tue Mar 07 16:44:43 2023 +0100
+++ b/conf/dstest_fsaccess.cfg	Tue Mar 07 19:10:40 2023 +0100
@@ -8,7 +8,7 @@
 
 l:startv({
     caps = {
-      server = pipe_server:svr(),
+      pipeserver = pipe_server:svr(),
     },
     log = { "pipes", "r" },
   },
@@ -18,32 +18,32 @@
 
 l:startv({
     caps = {
-      server = block_server:svr(),
+      fsserver = block_server:svr(),
     },
     log = { "blocksvr", "r" },
   },
   "rom/block_server", "10");
 
-local ext2svr = l:new_channel();
+local ext2server = l:new_channel();
 
 l:startv({
     caps = {
-      blocksvr = block_server,
-      pipes = pipe_server,
-      ext2svr = ext2svr:svr(),
+      blockserver = block_server,
+      pipeserver = pipe_server,
+      fsserver = ext2server:svr(),
     },
     log = { "ext2svr", "y" },
   },
-  "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr");
+  "rom/ext2_server", "blockserver", "rom/e2test.fs", "10", "fsserver");
 
 -- Obtain user filesystems with umask 0022 (18).
 
 local open_for_user = 6;
-local ext2svr_paulb = L4.cast(L4.Proto.Factory, ext2svr):create(open_for_user, 1000, 1000, 18);
+local ext2server_paulb = L4.cast(L4.Proto.Factory, ext2server):create(open_for_user, 1000, 1000, 18);
 
 l:startv({
     caps = {
-      server = ext2svr_paulb,
+      fsserver = ext2server_paulb,
     },
     log = { "client", "g" },
   },
diff -r 4a5c85bf5bb2 -r ec186bf44106 conf/dstest_host_client.cfg
--- a/conf/dstest_host_client.cfg	Tue Mar 07 16:44:43 2023 +0100
+++ b/conf/dstest_host_client.cfg	Tue Mar 07 19:10:40 2023 +0100
@@ -4,11 +4,11 @@
 
 local l = L4.default_loader;
 
-local server = l:new_channel();
+local host_server = l:new_channel();
 
 l:startv({
     caps = {
-      server = server:svr(),
+      fsserver = host_server:svr(),
     },
     log = { "server", "r" },
   },
@@ -16,7 +16,7 @@
 
 l:startv({
     caps = {
-      server = server,
+      fsserver = host_server,
     },
     log = { "client", "g" },
   },
diff -r 4a5c85bf5bb2 -r ec186bf44106 conf/dstest_host_readdir.cfg
--- a/conf/dstest_host_readdir.cfg	Tue Mar 07 16:44:43 2023 +0100
+++ b/conf/dstest_host_readdir.cfg	Tue Mar 07 19:10:40 2023 +0100
@@ -8,7 +8,7 @@
 
 l:startv({
     caps = {
-      server = pipe_server:svr(),
+      pipeserver = pipe_server:svr(),
     },
     log = { "pipes", "r" },
   },
@@ -18,8 +18,8 @@
 
 l:startv({
     caps = {
-      pipes = pipe_server,
-      server = host_server:svr(),
+      pipeserver = pipe_server,
+      fsserver = host_server:svr(),
     },
     log = { "server", "r" },
   },
@@ -27,7 +27,7 @@
 
 l:startv({
     caps = {
-      server = host_server,
+      fsserver = host_server,
     },
     log = { "client", "g" },
   },
diff -r 4a5c85bf5bb2 -r ec186bf44106 conf/dstest_pipe_client.cfg
--- a/conf/dstest_pipe_client.cfg	Tue Mar 07 16:44:43 2023 +0100
+++ b/conf/dstest_pipe_client.cfg	Tue Mar 07 19:10:40 2023 +0100
@@ -4,11 +4,11 @@
 
 local l = L4.default_loader;
 
-local server = l:new_channel();
+local pipe_server = l:new_channel();
 
 l:startv({
     caps = {
-      server = server:svr(),
+      pipeserver = pipe_server:svr(),
     },
     log = { "server", "r" },
   },
@@ -16,7 +16,7 @@
 
 l:start({
     caps = {
-      pipes = server,
+      pipeserver = pipe_server,
     },
     log = { "client", "g" },
   },
diff -r 4a5c85bf5bb2 -r ec186bf44106 conf/dstest_test_client.cfg
--- a/conf/dstest_test_client.cfg	Tue Mar 07 16:44:43 2023 +0100
+++ b/conf/dstest_test_client.cfg	Tue Mar 07 19:10:40 2023 +0100
@@ -4,11 +4,11 @@
 
 local l = L4.default_loader;
 
-local server = l:new_channel();
+local test_server = l:new_channel();
 
 l:startv({
     caps = {
-      server = server:svr(),
+      fsserver = test_server:svr(),
     },
     log = { "server", "r" },
   },
@@ -16,7 +16,7 @@
 
 l:start({
     caps = {
-      server = server,
+      fsserver = test_server,
     },
     log = { "client1", "g" },
   },
@@ -24,7 +24,7 @@
 
 l:start({
     caps = {
-      server = server,
+      fsserver = test_server,
     },
     log = { "client2", "b" },
   },
diff -r 4a5c85bf5bb2 -r ec186bf44106 libext2fs_blockserver/lib/src/blockserver_io.c
--- a/libext2fs_blockserver/lib/src/blockserver_io.c	Tue Mar 07 16:44:43 2023 +0100
+++ b/libext2fs_blockserver/lib/src/blockserver_io.c	Tue Mar 07 19:10:40 2023 +0100
@@ -1,7 +1,7 @@
 /*
  * blockserver_io.c --- L4Re block server I/O manager.
  *
- * Copyright (C) 2019, 2020, 2021, 2022 Paul Boddie <paul@boddie.org.uk>
+ * Copyright (C) 2019, 2020, 2021, 2022, 2023 Paul Boddie <paul@boddie.org.uk>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -26,6 +26,7 @@
 
 #include <ext2fs/ext2fs.h>
 #include <fsclient/client.h>
+#include <systypes/env.h>
 
 
 
@@ -40,7 +41,7 @@
 
 io_manager blockserver_io_manager; /* defined below */
 
-const char *blockserver_default_cap = "server";
+const char *blockserver_default_cap = ENV_FILESYSTEM_SERVER_NAME;
 
 
 
diff -r 4a5c85bf5bb2 -r ec186bf44106 libfsclient/lib/src/client.cc
--- a/libfsclient/lib/src/client.cc	Tue Mar 07 16:44:43 2023 +0100
+++ b/libfsclient/lib/src/client.cc	Tue Mar 07 19:10:40 2023 +0100
@@ -26,6 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <systypes/env.h>
 #include <systypes/fcntl.h>
 
 #include "client.h"
@@ -209,7 +210,7 @@
 
 l4_cap_idx_t client_open_for_user(user_t user)
 {
-  l4_cap_idx_t server = l4re_env_get_cap("server");
+  l4_cap_idx_t server = l4re_env_get_cap(ENV_FILESYSTEM_SERVER_NAME);
 
   return client_open_for_user_using(user, server);
 }
@@ -250,7 +251,7 @@
 
 file_t *client_open(const char *name, flags_t flags)
 {
-  l4_cap_idx_t server = l4re_env_get_cap("server");
+  l4_cap_idx_t server = l4re_env_get_cap(ENV_FILESYSTEM_SERVER_NAME);
 
   return client_open_using(name, flags, server);
 }
@@ -279,7 +280,7 @@
 
 file_t *client_opendir(const char *name)
 {
-  l4_cap_idx_t server = l4re_env_get_cap("server");
+  l4_cap_idx_t server = l4re_env_get_cap(ENV_FILESYSTEM_SERVER_NAME);
 
   return client_opendir_using(name, server);
 }
@@ -358,7 +359,7 @@
 
 long client_pipe(file_t **reader, file_t **writer, flags_t flags)
 {
-  l4_cap_idx_t server = l4re_env_get_cap("pipes");
+  l4_cap_idx_t server = l4re_env_get_cap(ENV_PIPE_SERVER_NAME);
 
   return client_pipe_using(reader, writer, flags, server);
 }
@@ -419,7 +420,7 @@
 
 long client_mkdir(const char *path, mode_t mode)
 {
-  l4_cap_idx_t server = l4re_env_get_cap("server");
+  l4_cap_idx_t server = l4re_env_get_cap(ENV_FILESYSTEM_SERVER_NAME);
 
   return client_mkdir_using(path, mode, server);
 }
@@ -437,7 +438,7 @@
 
 long client_remove(const char *path)
 {
-  l4_cap_idx_t server = l4re_env_get_cap("server");
+  l4_cap_idx_t server = l4re_env_get_cap(ENV_FILESYSTEM_SERVER_NAME);
 
   return client_remove_using(path, server);
 }
@@ -455,7 +456,7 @@
 
 long client_rename(const char *source, const char *target)
 {
-  l4_cap_idx_t server = l4re_env_get_cap("server");
+  l4_cap_idx_t server = l4re_env_get_cap(ENV_FILESYSTEM_SERVER_NAME);
 
   return client_rename_using(source, target, server);
 }
@@ -473,7 +474,7 @@
 
 long client_stat(const char *path, struct stat *st)
 {
-  l4_cap_idx_t server = l4re_env_get_cap("server");
+  l4_cap_idx_t server = l4re_env_get_cap(ENV_FILESYSTEM_SERVER_NAME);
 
   return client_stat_using(path, st, server);
 }
diff -r 4a5c85bf5bb2 -r ec186bf44106 libfsclient/lib/src/process.cc
--- a/libfsclient/lib/src/process.cc	Tue Mar 07 16:44:43 2023 +0100
+++ b/libfsclient/lib/src/process.cc	Tue Mar 07 19:10:40 2023 +0100
@@ -21,6 +21,7 @@
 
 #include <ipc/cap_alloc.h>
 #include <ipc/mem_ipc.h>
+#include <systypes/env.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -71,10 +72,10 @@
 
 long process_start(process_t *process, int argc, char *argv[])
 {
-  l4_cap_idx_t server = l4re_env_get_cap("pserver");
+  l4_cap_idx_t server = l4re_env_get_cap(ENV_PROCESS_SERVER_NAME);
 
   if (l4_is_invalid_cap(server))
-    return -L4_ENOMEM;
+    return -L4_ENOENT;
 
   /* Obtain a context for process creation. */
 
diff -r 4a5c85bf5bb2 -r ec186bf44106 libsystypes/include/systypes/env.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libsystypes/include/systypes/env.h	Tue Mar 07 19:10:40 2023 +0100
@@ -0,0 +1,32 @@
+/*
+ * Common environment definitions.
+ *
+ * Copyright (C) 2023 Paul Boddie <paul@boddie.org.uk>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301, USA
+ */
+
+#pragma once
+
+EXTERN_C_BEGIN
+
+#define ENV_FILESYSTEM_SERVER_NAME "fsserver"
+#define ENV_PIPE_SERVER_NAME       "pipeserver"
+#define ENV_PROCESS_SERVER_NAME    "prserver"
+
+EXTERN_C_END
+
+// vim: tabstop=2 expandtab shiftwidth=2
diff -r 4a5c85bf5bb2 -r ec186bf44106 servers/block_file_server.cc
--- a/servers/block_file_server.cc	Tue Mar 07 16:44:43 2023 +0100
+++ b/servers/block_file_server.cc	Tue Mar 07 19:10:40 2023 +0100
@@ -1,7 +1,7 @@
 /*
  * A dataspace server exposing files each as a block of writable memory.
  *
- * Copyright (C) 2020, 2021 Paul Boddie <paul@boddie.org.uk>
+ * Copyright (C) 2020, 2021, 2023 Paul Boddie <paul@boddie.org.uk>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -31,6 +31,7 @@
 #include <fsserver/pages.h>
 #include <fsserver/resource_server.h>
 #include <fsserver/block_file_opener.h>
+#include <systypes/env.h>
 
 
 
@@ -71,7 +72,7 @@
 
   /* Register a server associating it with the given object. */
 
-  const char *server_name = (argc > 2) ? argv[2] : "server";
+  const char *server_name = (argc > 2) ? argv[2] : ENV_FILESYSTEM_SERVER_NAME;
 
   ResourceServer server(&opener);
   err = server.bind(server_name);
diff -r 4a5c85bf5bb2 -r ec186bf44106 servers/client_file_server.cc
--- a/servers/client_file_server.cc	Tue Mar 07 16:44:43 2023 +0100
+++ b/servers/client_file_server.cc	Tue Mar 07 19:10:40 2023 +0100
@@ -2,7 +2,7 @@
  * A dataspace server exposing file contents accessed via the filesystem client
  * interface.
  *
- * Copyright (C) 2020, 2021 Paul Boddie <paul@boddie.org.uk>
+ * Copyright (C) 2020, 2021, 2023 Paul Boddie <paul@boddie.org.uk>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -32,6 +32,7 @@
 #include <fsserver/pages.h>
 #include <fsserver/resource_server.h>
 #include <fsserver/client_file_opener.h>
+#include <systypes/env.h>
 
 
 
@@ -72,7 +73,7 @@
 
   /* Register a server associating it with the given object. */
 
-  const char *server_name = (argc > 2) ? argv[2] : "server";
+  const char *server_name = (argc > 2) ? argv[2] : ENV_FILESYSTEM_SERVER_NAME;
 
   ResourceServer server(&opener);
   err = server.bind(server_name);
diff -r 4a5c85bf5bb2 -r ec186bf44106 servers/ext2_file_server.cc
--- a/servers/ext2_file_server.cc	Tue Mar 07 16:44:43 2023 +0100
+++ b/servers/ext2_file_server.cc	Tue Mar 07 19:10:40 2023 +0100
@@ -1,7 +1,7 @@
 /*
  * A dataspace server exposing file contents from an Ext2-based filesystem.
  *
- * Copyright (C) 2020, 2021 Paul Boddie <paul@boddie.org.uk>
+ * Copyright (C) 2020, 2021, 2023 Paul Boddie <paul@boddie.org.uk>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -32,6 +32,7 @@
 #include <fsserver/resource_server.h>
 #include <fsserver/ext2_filesystem.h>
 #include <mem/memory_incremental.h>
+#include <systypes/env.h>
 
 
 
@@ -72,7 +73,7 @@
   if (argc > 3)
     memory_pages = atoi(argv[3]);
 
-  const char *server_name = (argc > 4) ? argv[4] : "server";
+  const char *server_name = (argc > 4) ? argv[4] : ENV_FILESYSTEM_SERVER_NAME;
 
   /* Set the capability used to access the filesystem. */
 
diff -r 4a5c85bf5bb2 -r ec186bf44106 servers/host_file_server.cc
--- a/servers/host_file_server.cc	Tue Mar 07 16:44:43 2023 +0100
+++ b/servers/host_file_server.cc	Tue Mar 07 19:10:40 2023 +0100
@@ -1,7 +1,7 @@
 /*
  * A dataspace server exposing "host" file contents.
  *
- * Copyright (C) 2020, 2021 Paul Boddie <paul@boddie.org.uk>
+ * Copyright (C) 2020, 2021, 2023 Paul Boddie <paul@boddie.org.uk>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -31,6 +31,7 @@
 #include <fsserver/pages.h>
 #include <fsserver/resource_server.h>
 #include <fsserver/host_file_opener.h>
+#include <systypes/env.h>
 
 
 
@@ -71,7 +72,7 @@
 
   /* Register a server associating it with the given object. */
 
-  const char *server_name = (argc > 2) ? argv[2] : "server";
+  const char *server_name = (argc > 2) ? argv[2] : ENV_FILESYSTEM_SERVER_NAME;
 
   ResourceServer server(&opener);
   err = server.bind(server_name);
diff -r 4a5c85bf5bb2 -r ec186bf44106 servers/pipe_server.cc
--- a/servers/pipe_server.cc	Tue Mar 07 16:44:43 2023 +0100
+++ b/servers/pipe_server.cc	Tue Mar 07 19:10:40 2023 +0100
@@ -1,7 +1,7 @@
 /*
  * A pipe server.
  *
- * Copyright (C) 2020, 2021 Paul Boddie <paul@boddie.org.uk>
+ * Copyright (C) 2020, 2021, 2022, 2023 Paul Boddie <paul@boddie.org.uk>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -29,6 +29,7 @@
 #include <mem/memory_incremental.h>
 #include <fsserver/pipe_opener_resource.h>
 #include <fsserver/resource_server.h>
+#include <systypes/env.h>
 
 
 
@@ -66,7 +67,7 @@
 
   /* Register a server associating it with the given object. */
 
-  const char *server_name = (argc > 2) ? argv[2] : "server";
+  const char *server_name = (argc > 2) ? argv[2] : ENV_PIPE_SERVER_NAME;
 
   ResourceServer server(&opener);
   err = server.bind(server_name);
diff -r 4a5c85bf5bb2 -r ec186bf44106 servers/process_server.cc
--- a/servers/process_server.cc	Tue Mar 07 16:44:43 2023 +0100
+++ b/servers/process_server.cc	Tue Mar 07 19:10:40 2023 +0100
@@ -28,6 +28,7 @@
 
 #include <exec/process_creator_resource.h>
 #include <fsserver/resource_server.h>
+#include <systypes/env.h>
 
 
 
@@ -42,7 +43,7 @@
   }
 
   char *rm_filename = argv[1];
-  const char *server_name = (argc > 2) ? argv[2] : "pserver";
+  const char *server_name = (argc > 2) ? argv[2] : ENV_PROCESS_SERVER_NAME;
   long err;
 
   /* Introduce concurrency control. */
diff -r 4a5c85bf5bb2 -r ec186bf44106 servers/test_file_server.cc
--- a/servers/test_file_server.cc	Tue Mar 07 16:44:43 2023 +0100
+++ b/servers/test_file_server.cc	Tue Mar 07 19:10:40 2023 +0100
@@ -1,7 +1,7 @@
 /*
  * Test dataspace operations.
  *
- * Copyright (C) 2020, 2021 Paul Boddie <paul@boddie.org.uk>
+ * Copyright (C) 2020, 2021, 2023 Paul Boddie <paul@boddie.org.uk>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -32,6 +32,7 @@
 #include <fsserver/pages.h>
 #include <fsserver/resource_server.h>
 #include <fsserver/test_file_opener.h>
+#include <systypes/env.h>
 
 
 
@@ -70,7 +71,7 @@
 
   /* Register a server associating it with the given object. */
 
-  const char *server_name = (argc > 2) ? argv[2] : "server";
+  const char *server_name = (argc > 2) ? argv[2] : ENV_FILESYSTEM_SERVER_NAME;
 
   ResourceServer server(&opener);
   err = server.bind(server_name);
diff -r 4a5c85bf5bb2 -r ec186bf44106 tests/dstest_block_client.cc
--- a/tests/dstest_block_client.cc	Tue Mar 07 16:44:43 2023 +0100
+++ b/tests/dstest_block_client.cc	Tue Mar 07 19:10:40 2023 +0100
@@ -1,7 +1,7 @@
 /*
  * Test dataspace operations.
  *
- * Copyright (C) 2020, 2021, 2022 Paul Boddie <paul@boddie.org.uk>
+ * Copyright (C) 2020, 2021, 2022, 2023 Paul Boddie <paul@boddie.org.uk>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -22,6 +22,7 @@
 #include <l4/re/env.h>
 #include <l4/sys/err.h>
 
+#include <systypes/env.h>
 #include <systypes/fcntl.h>
 #include <systypes/format.h>
 
@@ -96,7 +97,7 @@
 
   /* Obtain access to the filesystem. */
 
-  l4_cap_idx_t server = l4re_env_get_cap("server");
+  l4_cap_idx_t server = l4re_env_get_cap(ENV_FILESYSTEM_SERVER_NAME);
 
   /* Invoke the open method to receive the file reference. */
 
diff -r 4a5c85bf5bb2 -r ec186bf44106 tests/dstest_file_mapping.cc
--- a/tests/dstest_file_mapping.cc	Tue Mar 07 16:44:43 2023 +0100
+++ b/tests/dstest_file_mapping.cc	Tue Mar 07 19:10:40 2023 +0100
@@ -1,7 +1,7 @@
 /*
  * Test manual mapping of dataspace content.
  *
- * Copyright (C) 2020, 2021, 2022 Paul Boddie <paul@boddie.org.uk>
+ * Copyright (C) 2020, 2021, 2022, 2023 Paul Boddie <paul@boddie.org.uk>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -22,6 +22,7 @@
 #include <l4/re/env.h>
 #include <l4/sys/err.h>
 
+#include <systypes/env.h>
 #include <systypes/fcntl.h>
 
 #include <stdio.h>
@@ -55,7 +56,7 @@
 
   /* Obtain access to the filesystem. */
 
-  l4_cap_idx_t server = l4re_env_get_cap("server");
+  l4_cap_idx_t server = l4re_env_get_cap(ENV_FILESYSTEM_SERVER_NAME);
 
   /* Invoke the open method to receive the file reference. */
 
diff -r 4a5c85bf5bb2 -r ec186bf44106 tests/dstest_host_client.cc
--- a/tests/dstest_host_client.cc	Tue Mar 07 16:44:43 2023 +0100
+++ b/tests/dstest_host_client.cc	Tue Mar 07 19:10:40 2023 +0100
@@ -1,7 +1,7 @@
 /*
  * Test dataspace operations.
  *
- * Copyright (C) 2020, 2021, 2022 Paul Boddie <paul@boddie.org.uk>
+ * Copyright (C) 2020, 2021, 2022, 2023 Paul Boddie <paul@boddie.org.uk>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -22,6 +22,7 @@
 #include <l4/re/env.h>
 #include <l4/sys/err.h>
 
+#include <systypes/env.h>
 #include <systypes/fcntl.h>
 
 #include <stdio.h>
@@ -53,7 +54,7 @@
 
   /* Obtain access to the filesystem. */
 
-  l4_cap_idx_t server = l4re_env_get_cap("server");
+  l4_cap_idx_t server = l4re_env_get_cap(ENV_FILESYSTEM_SERVER_NAME);
 
   /* Invoke the open method to receive the file reference. */
 
diff -r 4a5c85bf5bb2 -r ec186bf44106 tests/dstest_test_client.cc
--- a/tests/dstest_test_client.cc	Tue Mar 07 16:44:43 2023 +0100
+++ b/tests/dstest_test_client.cc	Tue Mar 07 19:10:40 2023 +0100
@@ -1,7 +1,7 @@
 /*
  * Test dataspace operations.
  *
- * Copyright (C) 2020, 2021, 2022 Paul Boddie <paul@boddie.org.uk>
+ * Copyright (C) 2020, 2021, 2022, 2023 Paul Boddie <paul@boddie.org.uk>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -22,6 +22,7 @@
 #include <l4/re/env.h>
 #include <l4/sys/err.h>
 
+#include <systypes/env.h>
 #include <systypes/fcntl.h>
 #include <systypes/format.h>
 
@@ -185,7 +186,7 @@
 
   /* Obtain access to the filesystem. */
 
-  l4_cap_idx_t server = l4re_env_get_cap("server");
+  l4_cap_idx_t server = l4re_env_get_cap(ENV_FILESYSTEM_SERVER_NAME);
 
   /* Obtain opener contexts for the files. */