diff --git a/lib/mkDarwinHost.nix b/lib/mkDarwinHost.nix
index ab42cc1..bdcd92a 100644
--- a/lib/mkDarwinHost.nix
+++ b/lib/mkDarwinHost.nix
@@ -29,7 +29,7 @@
             ../modules/hosts/common
             ../modules/hosts/common/all-gui.nix
             ../modules/hosts/darwin/home.nix
-            ../modules/hosts/darwin/${hostname}/${username}.nix 
+            ../modules/hosts/darwin/${hostname}/home-${username}.nix 
           ];
         };
       }
diff --git a/lib/mkNixosHost.nix b/lib/mkNixosHost.nix
index 1736949..128a6c5 100644
--- a/lib/mkNixosHost.nix
+++ b/lib/mkNixosHost.nix
@@ -21,7 +21,7 @@
           users.${username}.imports = [
             ../modules/hosts/common
             ../modules/hosts/common/linux/home.nix
-            ../modules/hosts/nixos/${hostname}/${username}.nix
+            ../modules/hosts/nixos/${hostname}/home-${username}.nix
           ];
         };
       }
diff --git a/modules/hosts/darwin/AirPuppet/gene.nix b/modules/hosts/darwin/AirPuppet/home-gene.nix
similarity index 100%
rename from modules/hosts/darwin/AirPuppet/gene.nix
rename to modules/hosts/darwin/AirPuppet/home-gene.nix
diff --git a/modules/hosts/darwin/Blue-Rock/gene.liverman.nix b/modules/hosts/darwin/Blue-Rock/home-gene.liverman.nix
similarity index 100%
rename from modules/hosts/darwin/Blue-Rock/gene.liverman.nix
rename to modules/hosts/darwin/Blue-Rock/home-gene.liverman.nix
diff --git a/modules/hosts/darwin/mightymac/gene.liverman.nix b/modules/hosts/darwin/mightymac/home-gene.liverman.nix
similarity index 100%
rename from modules/hosts/darwin/mightymac/gene.liverman.nix
rename to modules/hosts/darwin/mightymac/home-gene.liverman.nix
diff --git a/modules/hosts/nixos/bigboy/gene.nix b/modules/hosts/nixos/bigboy/home-gene.nix
similarity index 100%
rename from modules/hosts/nixos/bigboy/gene.nix
rename to modules/hosts/nixos/bigboy/home-gene.nix
diff --git a/modules/hosts/nixos/hetznix01/gene.nix b/modules/hosts/nixos/hetznix01/home-gene.nix
similarity index 100%
rename from modules/hosts/nixos/hetznix01/gene.nix
rename to modules/hosts/nixos/hetznix01/home-gene.nix
diff --git a/modules/hosts/nixos/hetznix02/gene.nix b/modules/hosts/nixos/hetznix02/home-gene.nix
similarity index 100%
rename from modules/hosts/nixos/hetznix02/gene.nix
rename to modules/hosts/nixos/hetznix02/home-gene.nix
diff --git a/modules/hosts/nixos/nixnas1/gene.nix b/modules/hosts/nixos/nixnas1/home-gene.nix
similarity index 100%
rename from modules/hosts/nixos/nixnas1/gene.nix
rename to modules/hosts/nixos/nixnas1/home-gene.nix
diff --git a/modules/hosts/nixos/nixnuc/gene.nix b/modules/hosts/nixos/nixnuc/home-gene.nix
similarity index 100%
rename from modules/hosts/nixos/nixnuc/gene.nix
rename to modules/hosts/nixos/nixnuc/home-gene.nix
diff --git a/modules/hosts/nixos/rainbow-planet/gene.nix b/modules/hosts/nixos/rainbow-planet/home-gene.nix
similarity index 100%
rename from modules/hosts/nixos/rainbow-planet/gene.nix
rename to modules/hosts/nixos/rainbow-planet/home-gene.nix