diff --git a/modules/defaults.nix b/modules/defaults.nix
index ed70a6a..3b3ccb8 100644
--- a/modules/defaults.nix
+++ b/modules/defaults.nix
@@ -1,4 +1,4 @@
-{ lib, den, ... }:
+{ lib, ... }:
 {
   den.default.nixos.system.stateVersion = "25.11";
   den.default.homeManager.home.stateVersion = "25.11";
@@ -7,7 +7,7 @@
   den.schema.user.classes = lib.mkDefault [ "homeManager" ];
 
   # User TODO: REMOVE THIS
-  den.aspects.tux.nixos = {
+  den.aspects.igneous.nixos = {
     boot.loader.grub.enable = false;
     fileSystems."/".device = "/dev/fake";
     fileSystems."/".fsType = "auto";
diff --git a/modules/igloo.nix b/modules/flock.nix
similarity index 77%
rename from modules/igloo.nix
rename to modules/flock.nix
index 9d5dd08..93d739b 100644
--- a/modules/igloo.nix
+++ b/modules/flock.nix
@@ -1,6 +1,11 @@
+{ den, ... }:
 {
   # host aspect
-  den.aspects.igloo = {
+  den.aspects.flock = {
+    includes = [
+      (den.batteries.hostname)
+    ];
+
     # host NixOS configuration
     nixos =
       { pkgs, ... }:
diff --git a/modules/hosts.nix b/modules/hosts.nix
index a4f89ee..9447c59 100644
--- a/modules/hosts.nix
+++ b/modules/hosts.nix
@@ -1,19 +1,3 @@
-# defines all hosts + users + homes.
-# then config their aspects in as many files you want
 {
-  # tux user at igloo host.
-  den.hosts.x86_64-linux.igloo.users.tux = { };
-
-  # define an standalone home-manager for tux
-  # den.homes.x86_64-linux.tux = { };
-
-  # be sure to add nix-darwin input for this:
-  # den.hosts.aarch64-darwin.apple.users.alice = { };
-
-  # other hosts can also have user tux.
-  # den.hosts.x86_64-linux.south = {
-  #   wsl = { }; # add nixos-wsl input for this.
-  #   users.tux = { };
-  #   users.orca = { };
-  # };
+  den.hosts.x86_64-linux.flock.users.igneous = { };
 }
diff --git a/modules/tux.nix b/modules/igneous.nix
similarity index 72%
rename from modules/tux.nix
rename to modules/igneous.nix
index 015a1f3..695c850 100644
--- a/modules/tux.nix
+++ b/modules/igneous.nix
@@ -1,11 +1,11 @@
 { den, ... }:
 {
   # user aspect
-  den.aspects.tux = {
+  den.aspects.igneous = {
     includes = [
       den.batteries.define-user
       den.batteries.primary-user
-      (den.batteries.user-shell "fish")
+      (den.batteries.user-shell "zsh")
     ];
 
     homeManager =
@@ -16,6 +16,6 @@
 
     # user can provide NixOS configurations
     # to any host it is included on
-    provides.to-hosts.nixos = { pkgs, ... }: { };
+    # provides.to-hosts.nixos = { pkgs, ... }: { };
   };
 }
diff --git a/modules/nh.nix b/modules/nh.nix
index 3079b01..3b80c2f 100644
--- a/modules/nh.nix
+++ b/modules/nh.nix
@@ -1,5 +1,5 @@
 # Exposes flake apps under the name of each host / home for building with nh.
-{ den, lib, ... }:
+{ den, ... }:
 {
   perSystem =
     { pkgs, ... }:
diff --git a/modules/vm.nix b/modules/vm.nix
index a330064..6e7668d 100644
--- a/modules/vm.nix
+++ b/modules/vm.nix
@@ -5,7 +5,7 @@
 {
 
   # USER TODO: remove this tty-autologin used for the VM
-  den.aspects.igloo.includes = [ (den.batteries.tty-autologin "tux") ];
+  den.aspects.flock.includes = [ (den.batteries.tty-autologin "igneous") ];
 
   perSystem =
     { pkgs, ... }:
@@ -14,7 +14,7 @@
         name = "vm";
         text =
           let
-            host = inputs.self.nixosConfigurations.igloo.config;
+            host = inputs.self.nixosConfigurations.flock.config;
           in
           ''
             ${host.system.build.vm}/bin/run-${host.networking.hostName}-vm "$@"