diff --git a/hosts/orm/configuration.nix b/hosts/orm/configuration.nix
index cd96237..f0553fd 100644
--- a/hosts/orm/configuration.nix
+++ b/hosts/orm/configuration.nix
@@ -11,7 +11,7 @@
 
   age.secrets.wireguard-peer-orm.file = ../../secrets/wireguard-peer-orm.age;
 
-  birdsong.peer = {
+  birdsong.peering = {
     enable = true;
     privateKeyFile = config.age.secrets.wireguard-peer-orm.path;
   };
diff --git a/hosts/tohru/configuration.nix b/hosts/tohru/configuration.nix
index 4218f5d..1d1977e 100644
--- a/hosts/tohru/configuration.nix
+++ b/hosts/tohru/configuration.nix
@@ -16,7 +16,7 @@
 
   age.secrets.wireguard-peer-tohru.file = ../../secrets/wireguard-peer-tohru.age;
 
-  birdsong.peer = {
+  birdsong.peering = {
     enable = true;
     privateKeyFile = config.age.secrets.wireguard-peer-tohru.path;
     persistentKeepalive = 23;
diff --git a/hosts/yevaud/configuration.nix b/hosts/yevaud/configuration.nix
index 4fc10f9..4df7229 100644
--- a/hosts/yevaud/configuration.nix
+++ b/hosts/yevaud/configuration.nix
@@ -11,7 +11,7 @@
 
   age.secrets.wireguard-peer-yevaud.file = ../../secrets/wireguard-peer-yevaud.age;
 
-  birdsong.peer = {
+  birdsong.peering = {
     enable = true;
     privateKeyFile = config.age.secrets.wireguard-peer-yevaud.path;
   };
diff --git a/services/birdsong/default.nix b/services/birdsong/default.nix
index 3a42299..5987348 100644
--- a/services/birdsong/default.nix
+++ b/services/birdsong/default.nix
@@ -1,6 +1,6 @@
 {
   imports = [
-    ./peer.nix
     ./hosts.nix
+    ./peering.nix
   ];
 }
\ No newline at end of file
diff --git a/services/birdsong/peer.nix b/services/birdsong/peering.nix
similarity index 93%
rename from services/birdsong/peer.nix
rename to services/birdsong/peering.nix
index d1b659b..9832e4f 100644
--- a/services/birdsong/peer.nix
+++ b/services/birdsong/peering.nix
@@ -2,13 +2,13 @@
 
 with lib;
 let
-  cfg = config.birdsong.peer;
+  cfg = config.birdsong.peering;
   hostName = if null != cfg.hostName then cfg.hostName else config.networking.hostName;
   hosts = config.birdsong.hosts;
   host = hosts.${hostName};
 in
 {
-  options.birdsong.peer = {
+  options.birdsong.peering = {
     enable = mkEnableOption "WireGuard peering with the birdsong network";
     hostName = mkOption {
       default = null;
@@ -53,11 +53,11 @@ in
     assertions = [
       {
         assertion = cfg ? privateKeyFile;
-        message = "birdsong.peer.privateKeyFile must be set";
+        message = "birdsong.peering.privateKeyFile must be set";
       }
       {
         assertion = hostName != null;
-        message = "birdsong.peer.hostName or networking.hostName must be set";
+        message = "birdsong.peering.hostName or networking.hostName must be set";
       }
     ];