diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 3735105..5a66886 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,3 +1,8 @@
 # nix fmt & statix
 f011c8d71ba09bd94ab04b8d771858b90a03fbf9
 3aff25b4486a143cd6282f8845c16216598e1c7e
+
+# host rename
+cfe4c43887a41e52be4e6472474c0fc3788f86e8
+bebb7c42bbe87fe041b53189e78a4553e8c08666
+258902d409e68b47f781451e6d306a8e47198d75
diff --git a/flake.nix b/flake.nix
index fccbfbc..b3358a2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -69,17 +69,17 @@
       lib = my-lib;
 
       nixosConfigurations = {
-        matej-nixos = mkHost "matej-nixos" {
+        fw16 = mkHost "fw16" {
           system = "x86_64-linux";
           user = "matej";
         };
-        matej-tower = mkHost "matej-tower" {
+        tower = mkHost "tower" {
           system = "x86_64-linux";
           user = "matej";
         };
 
-        # nixos-rebuild build-image --image-variant install-iso --flake .#live-iso
-        live-iso = mkHost "live-iso" {
+        # nixos-rebuild build-image --image-variant install-iso --flake .#iso
+        iso = mkHost "iso" {
           system = "x86_64-linux";
         };
       };
diff --git a/hosts/matej-nixos/configuration.nix b/hosts/fw16/configuration.nix
similarity index 98%
rename from hosts/matej-nixos/configuration.nix
rename to hosts/fw16/configuration.nix
index 196775b..a21a8b3 100644
--- a/hosts/matej-nixos/configuration.nix
+++ b/hosts/fw16/configuration.nix
@@ -64,7 +64,7 @@ in
   programs.nm-applet.enable = true;
 
   networking = {
-    hostName = "matej-nixos";
+    hostName = "fw16";
     networkmanager.enable = true;
     firewall.enable = false;
     nameservers = [
diff --git a/hosts/matej-nixos/hardware-configuration.nix b/hosts/fw16/hardware-configuration.nix
similarity index 100%
rename from hosts/matej-nixos/hardware-configuration.nix
rename to hosts/fw16/hardware-configuration.nix
diff --git a/hosts/live-iso/configuration.nix b/hosts/iso/configuration.nix
similarity index 100%
rename from hosts/live-iso/configuration.nix
rename to hosts/iso/configuration.nix
diff --git a/hosts/matej-tower/configuration.nix b/hosts/tower/configuration.nix
similarity index 97%
rename from hosts/matej-tower/configuration.nix
rename to hosts/tower/configuration.nix
index 39b20b2..b70097b 100644
--- a/hosts/matej-tower/configuration.nix
+++ b/hosts/tower/configuration.nix
@@ -60,7 +60,7 @@
     easyeffects
   ];
 
-  networking.hostName = "matej-tower";
+  networking.hostName = "tower";
 
   xdg.mime.defaultApplications = {
     "application/pdf" = "org.pwmt.zathura.desktop";
diff --git a/hosts/matej-tower/hardware-configuration.nix b/hosts/tower/hardware-configuration.nix
similarity index 100%
rename from hosts/matej-tower/hardware-configuration.nix
rename to hosts/tower/hardware-configuration.nix
diff --git a/justfile b/justfile
index c79400b..8d6764c 100644
--- a/justfile
+++ b/justfile
@@ -31,7 +31,7 @@ build:
 
 # build installation iso
 iso:
-    nixos-rebuild build-image --image-variant iso-installer --flake .#live-iso
+    nixos-rebuild build-image --image-variant iso-installer --flake .#iso
 
 # garbage collect old generations
 clean: