diff --git a/clanServices/borgbackup/README.md b/clanServices/borgbackup/README.md
index 3e43e74c7..af1fc5f56 100644
--- a/clanServices/borgbackup/README.md
+++ b/clanServices/borgbackup/README.md
@@ -5,7 +5,7 @@ inventory.instances = {
   borgbackup = {
     module = {
       name = "borgbackup";
-      input = "clan";
+      input = "clan-core";
     };
     roles.client.machines."jon".settings = {
       destinations."storagebox" = {
diff --git a/clanServices/trusted-nix-caches/README.md b/clanServices/trusted-nix-caches/README.md
index 307cc33ab..203615f7c 100644
--- a/clanServices/trusted-nix-caches/README.md
+++ b/clanServices/trusted-nix-caches/README.md
@@ -7,7 +7,7 @@ inventory.instances = {
   clan-cache = {
     module = {
       name = "trusted-nix-caches";
-      input = "clan";
+      input = "clan-core";
     };
     roles.default.machines.draper = { };
   };
diff --git a/clanServices/users/README.md b/clanServices/users/README.md
index 1b53fce03..4055eb9d3 100644
--- a/clanServices/users/README.md
+++ b/clanServices/users/README.md
@@ -8,7 +8,7 @@
     user-alice = {
       module = {
         name = "users";
-        input = "clan";
+        input = "clan-core";
       };
       roles.default.tags.all = { };
       roles.default.settings = {
@@ -35,7 +35,7 @@
     user-bob = {
       module = {
         name = "users";
-        input = "clan";
+        input = "clan-core";
       };
       roles.default.machines.bobs-laptop = { };
       roles.default.settings.user = "bob";
diff --git a/clanServices/zerotier/README.md b/clanServices/zerotier/README.md
index dab69677c..07616fc4d 100644
--- a/clanServices/zerotier/README.md
+++ b/clanServices/zerotier/README.md
@@ -5,7 +5,7 @@ inventory.instances = {
   zerotier = {
     module = {
       name = "zerotier";
-      input = "clan";
+      input = "clan-core";
     };
     roles.peer.tags.all = { };
     roles.controller.machines.jon = { };
@@ -18,7 +18,6 @@ All machines will be peers and connected to the zerotier network.
 Jon is the controller machine, which will will accept other machines into the network.
 Sara is a moon and sets the `stableEndpoint` setting with a publicly reachable IP, the moon is optional.
 
-
 ## Overview
 
 This guide explains how to set up and manage a [ZeroTier VPN](https://zerotier.com) for a clan network. Each VPN requires a single controller and can support multiple peers and optional moons for better connectivity.
diff --git a/docs/site/guides/backups.md b/docs/site/guides/backups.md
index 183eb0176..873118e18 100644
--- a/docs/site/guides/backups.md
+++ b/docs/site/guides/backups.md
@@ -1,4 +1,3 @@
-
 This guide explains how to set up and manage
 [BorgBackup](https://borgbackup.readthedocs.io/) for secure, efficient backups
 in a clan network. BorgBackup provides:
@@ -18,7 +17,7 @@ inventory.instances = {
   borgbackup = {
     module = {
       name = "borgbackup";
-      input = "clan";
+      input = "clan-core";
     };
     roles.client.machines."jon".settings = {
       destinations."storagebox" = {
@@ -177,7 +176,7 @@ storagebox::username@username.your-storagebox.de:/./borgbackup::jon-storagebox-2
 
 ### Restoring backups
 
-For restoring a backup you have two options. 
+For restoring a backup you have two options.
 
 #### Full restoration
 
@@ -194,6 +193,3 @@ To restore only a specific service (e.g., `linkding`):
 ```bash
 clan backups restore --service linkding jon borgbackup storagebox::u444061@u444061.your-storagebox.de:/./borgbackup::jon-storagebox-2025-07-24T06:02:35
 ```
-
-
-
diff --git a/templates/clan/flake-parts-minimal/clan.nix b/templates/clan/flake-parts-minimal/clan.nix
index 30d158525..173e01fe4 100644
--- a/templates/clan/flake-parts-minimal/clan.nix
+++ b/templates/clan/flake-parts-minimal/clan.nix
@@ -1,7 +1,7 @@
 { inputs, ... }:
 {
   imports = [
-    inputs.clan.flakeModules.default
+    inputs.clan-core.flakeModules.default
   ];
   clan = {
     meta.name = "__CHANGE_ME__";
diff --git a/templates/clan/flake-parts-minimal/devshells.nix b/templates/clan/flake-parts-minimal/devshells.nix
index 43a2d86db..aa50afbbb 100644
--- a/templates/clan/flake-parts-minimal/devshells.nix
+++ b/templates/clan/flake-parts-minimal/devshells.nix
@@ -9,7 +9,7 @@ _: {
       devShells = {
         default = pkgs.mkShellNoCC {
           packages = [
-            inputs'.clan.packages.default
+            inputs'.clan-core.packages.default
           ];
         };
       };