diff --git a/clusters/fs0/default.nix b/clusters/fs0/default.nix
index 2c9f4b0..a57cfe1 100644
--- a/clusters/fs0/default.nix
+++ b/clusters/fs0/default.nix
@@ -1,6 +1,6 @@
 with import <nixpkgs> {};
 let
-  lib = import ../../lib/default.nix { inherit pkgs cfg lib config; };
+  setup = import ../../lib/default.nix { inherit pkgs cfg lib config; };
 
   hosts = [
     { name = "fs0-0"; address = "10.253.18.106"; hw = ./fs0-0.nix; }
@@ -41,4 +41,4 @@ let
     '';
   };
 in
-  lib.fs.mkDeployment hosts
+  setup.fs.mkDeployment hosts
diff --git a/clusters/fs2/default.nix b/clusters/fs2/default.nix
index 1646564..ed40edb 100644
--- a/clusters/fs2/default.nix
+++ b/clusters/fs2/default.nix
@@ -1,12 +1,12 @@
 with import <nixpkgs> {};
 let
-  lib = import ../../lib/default.nix { inherit pkgs cfg lib config; };
+  setup = import ../../lib/default.nix { inherit pkgs cluster lib config; };
 
   hosts = [
     { name = "fs2-0"; address = "10.1.2.117"; hw = ./fs2-0.nix; }
   ];
 
-  cfg = {
+  cluster = {
     initca = ./ca;
     clusterName = "fs2";
     extraHosts = ''
@@ -41,4 +41,4 @@ let
     '';
   };
 in
-  lib.fs.mkDeployment hosts
+  setup.fs.mkDeployment hosts
diff --git a/clusters/k0/default.nix b/clusters/k0/default.nix
index 59d7ee1..fcfecac 100644
--- a/clusters/k0/default.nix
+++ b/clusters/k0/default.nix
@@ -1,6 +1,6 @@
 with import <nixpkgs> {};
 let
-  lib = import ../../lib/default.nix { inherit pkgs cfg customize lib config; };
+  setup = import ../../lib/default.nix { inherit pkgs cfg customize lib config; };
 
   hosts = [
     { name = "k0-1"; address = "10.253.18.101"; hw = ./k0-1.nix; }
@@ -72,4 +72,4 @@ let
     };
   };
 in
-  lib.k8s.mkDeployment cfg.k8s.master hosts
+  setup.k8s.mkDeployment cfg.k8s.master hosts
diff --git a/clusters/k1/default.nix b/clusters/k1/default.nix
index ee88beb..4d4ce63 100644
--- a/clusters/k1/default.nix
+++ b/clusters/k1/default.nix
@@ -1,6 +1,6 @@
 with import <nixpkgs> {};
 let
-  lib = import ../../lib/default.nix { inherit pkgs cfg customize lib config; };
+  setup = import ../../lib/default.nix { inherit pkgs cfg customize lib config; };
 
   hosts = [
     { name = "k1-1"; address = "10.253.18.110"; hw = ./k1-1.nix; }
@@ -74,4 +74,4 @@ let
     };
   };
 in
-  lib.k8s.mkDeployment cfg.k8s.master hosts
+  setup.k8s.mkDeployment cfg.k8s.master hosts
diff --git a/clusters/k2/default.nix b/clusters/k2/default.nix
index 6672289..49661e7 100644
--- a/clusters/k2/default.nix
+++ b/clusters/k2/default.nix
@@ -1,6 +1,6 @@
 with import <nixpkgs> {};
 let
-  lib = import ../../lib/default.nix { inherit pkgs cfg customize lib config; };
+  setup = import ../../lib/default.nix { inherit pkgs cfg customize lib config; };
 
   hosts = [
     { name = "k2-1"; address = "10.253.18.115"; hw = ./k2-1.nix; }
@@ -75,4 +75,4 @@ let
     };
   };
 in
-  lib.k8s.mkDeployment cfg.k8s.master hosts
+  setup.k8s.mkDeployment cfg.k8s.master hosts