diff --git a/docs/hacking.md b/docs/hacking.md
index 01cb8969..aa77efe9 100644
--- a/docs/hacking.md
+++ b/docs/hacking.md
@@ -52,7 +52,7 @@ Public Key (DID Key Syntax): share or publish this (eg, in DID document)
         did:key:zDnaeUBxtG6Xuv3ATJE4GaWeyXM3jyamJsZw3bSPpxx4bNXDR
 
 # the secret key from above
-export TANGLED_OAUTH_CLIENT_SECRET="z42tuP..." 
+export TANGLED_OAUTH_CLIENT_SECRET="z42tuP..."
 
 # run redis in at a new shell to store oauth sessions
 redis-server
@@ -168,5 +168,5 @@ litecli /var/lib/spindle/spindle.db
 
 If for any reason you wish to disable either one of the
 services in the VM, modify [nix/vm.nix](/nix/vm.nix) and set
-`services.tangled-spindle.enable` (or
-`services.tangled-knot.enable`) to `false`.
+`services.tangled.spindle.enable` (or
+`services.tangled.knot.enable`) to `false`.
diff --git a/docs/migrations.md b/docs/migrations.md
index fc726e29..1308f748 100644
--- a/docs/migrations.md
+++ b/docs/migrations.md
@@ -49,7 +49,7 @@ If you use the nix module, simply bump the flake to the
 latest revision, and change your config block like so:
 
 ```diff
- services.tangled-knot = {
+ services.tangled.knot = {
    enable = true;
    server = {
 -    secretFile = /path/to/secret;
diff --git a/flake.nix b/flake.nix
index 96f51954..f26ceab5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -283,7 +283,7 @@
     }: {
       imports = [./nix/modules/appview.nix];
 
-      services.tangled-appview.package = lib.mkDefault self.packages.${pkgs.system}.appview;
+      services.tangled.appview.package = lib.mkDefault self.packages.${pkgs.system}.appview;
     };
     nixosModules.knot = {
       lib,
@@ -292,7 +292,7 @@
     }: {
       imports = [./nix/modules/knot.nix];
 
-      services.tangled-knot.package = lib.mkDefault self.packages.${pkgs.system}.knot;
+      services.tangled.knot.package = lib.mkDefault self.packages.${pkgs.system}.knot;
     };
     nixosModules.spindle = {
       lib,
@@ -301,7 +301,7 @@
     }: {
       imports = [./nix/modules/spindle.nix];
 
-      services.tangled-spindle.package = lib.mkDefault self.packages.${pkgs.system}.spindle;
+      services.tangled.spindle.package = lib.mkDefault self.packages.${pkgs.system}.spindle;
     };
   };
 }
diff --git a/nix/modules/appview.nix b/nix/modules/appview.nix
index c3dde4c6..0435f797 100644
--- a/nix/modules/appview.nix
+++ b/nix/modules/appview.nix
@@ -3,11 +3,11 @@
   lib,
   ...
 }: let
-  cfg = config.services.tangled-appview;
+  cfg = config.services.tangled.appview;
 in
   with lib; {
     options = {
-      services.tangled-appview = {
+      services.tangled.appview = {
         enable = mkOption {
           type = types.bool;
           default = false;
@@ -25,7 +25,7 @@ in
         environmentFile = mkOption {
           type = with types; nullOr path;
           default = null;
-          example = "/etc/tangled-appview.env";
+          example = "/etc-/appview.env";
           description = ''
             Additional environment file as defined in {manpage}`systemd.exec(5)`.
 
@@ -39,7 +39,7 @@ in
     };
 
     config = mkIf cfg.enable {
-      systemd.services.tangled-appview = {
+      systemd.services.tangled.appview = {
         description = "tangled appview service";
         wantedBy = ["multi-user.target"];
 
diff --git a/nix/modules/knot.nix b/nix/modules/knot.nix
index dabbd396..b3288117 100644
--- a/nix/modules/knot.nix
+++ b/nix/modules/knot.nix
@@ -4,11 +4,11 @@
   lib,
   ...
 }: let
-  cfg = config.services.tangled-knot;
+  cfg = config.services.tangled.knot;
 in
   with lib; {
     options = {
-      services.tangled-knot = {
+      services.tangled.knot = {
         enable = mkOption {
           type = types.bool;
           default = false;
diff --git a/nix/modules/spindle.nix b/nix/modules/spindle.nix
index bb43dd04..623e5c7b 100644
--- a/nix/modules/spindle.nix
+++ b/nix/modules/spindle.nix
@@ -3,11 +3,11 @@
   lib,
   ...
 }: let
-  cfg = config.services.tangled-spindle;
+  cfg = config.services.tangled.spindle;
 in
   with lib; {
     options = {
-      services.tangled-spindle = {
+      services.tangled.spindle = {
         enable = mkOption {
           type = types.bool;
           default = false;
diff --git a/nix/vm.nix b/nix/vm.nix
index 33a2a5d5..3ac56d21 100644
--- a/nix/vm.nix
+++ b/nix/vm.nix
@@ -73,7 +73,7 @@ in
         time.timeZone = "Europe/London";
         services.getty.autologinUser = "root";
         environment.systemPackages = with pkgs; [curl vim git sqlite litecli];
-        services.tangled-knot = {
+        services.tangled.knot = {
           enable = true;
           motd = "Welcome to the development knot!\n";
           server = {
@@ -82,7 +82,7 @@ in
             listenAddr = "0.0.0.0:6000";
           };
         };
-        services.tangled-spindle = {
+        services.tangled.spindle = {
           enable = true;
           server = {
             owner = envVar "TANGLED_VM_SPINDLE_OWNER";
@@ -99,8 +99,8 @@ in
         users = {
           # So we don't have to deal with permission clashing between
           # blank disk VMs and existing state
-          users.${config.services.tangled-knot.gitUser}.uid = 666;
-          groups.${config.services.tangled-knot.gitUser}.gid = 666;
+          users.${config.services.tangled.knot.gitUser}.uid = 666;
+          groups.${config.services.tangled.knot.gitUser}.gid = 666;
 
           # TODO: separate spindle user
         };
@@ -120,8 +120,8 @@ in
             serviceConfig.PermissionsStartOnly = true;
           };
         in {
-          knot = mkDataSyncScripts "/mnt/knot-data" config.services.tangled-knot.stateDir;
-          spindle = mkDataSyncScripts "/mnt/spindle-data" (builtins.dirOf config.services.tangled-spindle.server.dbPath);
+          knot = mkDataSyncScripts "/mnt/knot-data" config.services.tangled.knot.stateDir;
+          spindle = mkDataSyncScripts "/mnt/spindle-data" (builtins.dirOf config.services.tangled.spindle.server.dbPath);
         };
       })
     ];