diff --git a/flake.nix b/flake.nix
index 4afbe6e..1561170 100644
--- a/flake.nix
+++ b/flake.nix
@@ -63,7 +63,7 @@
     } {
       systems = ["x86_64-linux"];
       imports = [
-        ./computers
+        ./hosts
         ./overlays
         inputs.git-hooks-nix.flakeModule
       ];
diff --git a/computers/default.nix b/hosts/default.nix
similarity index 85%
rename from computers/default.nix
rename to hosts/default.nix
index ddbbb36..9e0bbdf 100644
--- a/computers/default.nix
+++ b/hosts/default.nix
@@ -4,7 +4,7 @@
   ...
 }: {
   flake = {
-    nixosConfigurations = lib.mkComputers {
+    nixosConfigurations = lib.mkHosts {
       python = {
         system = "x86_64-linux";
         user = "artur";
diff --git a/computers/python/apps.nix b/hosts/python/apps.nix
similarity index 100%
rename from computers/python/apps.nix
rename to hosts/python/apps.nix
diff --git a/computers/python/configs/fuzzel/fuzzel.ini b/hosts/python/configs/fuzzel/fuzzel.ini
similarity index 100%
rename from computers/python/configs/fuzzel/fuzzel.ini
rename to hosts/python/configs/fuzzel/fuzzel.ini
diff --git a/computers/python/configs/kanshi/config b/hosts/python/configs/kanshi/config
similarity index 100%
rename from computers/python/configs/kanshi/config
rename to hosts/python/configs/kanshi/config
diff --git a/computers/python/configs/kitty/current-theme.conf b/hosts/python/configs/kitty/current-theme.conf
similarity index 100%
rename from computers/python/configs/kitty/current-theme.conf
rename to hosts/python/configs/kitty/current-theme.conf
diff --git a/computers/python/configs/kitty/kitty.conf b/hosts/python/configs/kitty/kitty.conf
similarity index 100%
rename from computers/python/configs/kitty/kitty.conf
rename to hosts/python/configs/kitty/kitty.conf
diff --git a/computers/python/configs/kitty/kitty.conf.bak b/hosts/python/configs/kitty/kitty.conf.bak
similarity index 100%
rename from computers/python/configs/kitty/kitty.conf.bak
rename to hosts/python/configs/kitty/kitty.conf.bak
diff --git a/computers/python/configs/qutebrowser/config.py b/hosts/python/configs/qutebrowser/config.py
similarity index 100%
rename from computers/python/configs/qutebrowser/config.py
rename to hosts/python/configs/qutebrowser/config.py
diff --git a/computers/python/configs/river/init b/hosts/python/configs/river/init
similarity index 100%
rename from computers/python/configs/river/init
rename to hosts/python/configs/river/init
diff --git a/computers/python/default.nix b/hosts/python/default.nix
similarity index 100%
rename from computers/python/default.nix
rename to hosts/python/default.nix
diff --git a/computers/python/disks.nix b/hosts/python/disks.nix
similarity index 100%
rename from computers/python/disks.nix
rename to hosts/python/disks.nix
diff --git a/computers/python/fonts.nix b/hosts/python/fonts.nix
similarity index 100%
rename from computers/python/fonts.nix
rename to hosts/python/fonts.nix
diff --git a/computers/python/hardware.nix b/hosts/python/hardware.nix
similarity index 100%
rename from computers/python/hardware.nix
rename to hosts/python/hardware.nix
diff --git a/computers/python/theme.nix b/hosts/python/theme.nix
similarity index 100%
rename from computers/python/theme.nix
rename to hosts/python/theme.nix
diff --git a/computers/python/users.nix b/hosts/python/users.nix
similarity index 100%
rename from computers/python/users.nix
rename to hosts/python/users.nix
diff --git a/computers/shared/aliases.nix b/hosts/shared/aliases.nix
similarity index 100%
rename from computers/shared/aliases.nix
rename to hosts/shared/aliases.nix
diff --git a/computers/shared/default.nix b/hosts/shared/default.nix
similarity index 100%
rename from computers/shared/default.nix
rename to hosts/shared/default.nix
diff --git a/computers/shared/direnv.nix b/hosts/shared/direnv.nix
similarity index 100%
rename from computers/shared/direnv.nix
rename to hosts/shared/direnv.nix
diff --git a/computers/shared/emacs.nix b/hosts/shared/emacs.nix
similarity index 100%
rename from computers/shared/emacs.nix
rename to hosts/shared/emacs.nix
diff --git a/computers/shared/fish.nix b/hosts/shared/fish.nix
similarity index 100%
rename from computers/shared/fish.nix
rename to hosts/shared/fish.nix
diff --git a/computers/shared/fonts.nix b/hosts/shared/fonts.nix
similarity index 100%
rename from computers/shared/fonts.nix
rename to hosts/shared/fonts.nix
diff --git a/computers/shared/git.nix b/hosts/shared/git.nix
similarity index 100%
rename from computers/shared/git.nix
rename to hosts/shared/git.nix
diff --git a/computers/shared/libvirt.nix b/hosts/shared/libvirt.nix
similarity index 100%
rename from computers/shared/libvirt.nix
rename to hosts/shared/libvirt.nix
diff --git a/computers/shared/mpd.nix b/hosts/shared/mpd.nix
similarity index 100%
rename from computers/shared/mpd.nix
rename to hosts/shared/mpd.nix
diff --git a/computers/shared/pipewire.nix b/hosts/shared/pipewire.nix
similarity index 100%
rename from computers/shared/pipewire.nix
rename to hosts/shared/pipewire.nix
diff --git a/computers/shared/qutebrowser.nix b/hosts/shared/qutebrowser.nix
similarity index 100%
rename from computers/shared/qutebrowser.nix
rename to hosts/shared/qutebrowser.nix
diff --git a/computers/shared/river.nix b/hosts/shared/river.nix
similarity index 100%
rename from computers/shared/river.nix
rename to hosts/shared/river.nix
diff --git a/computers/shared/sddm.nix b/hosts/shared/sddm.nix
similarity index 100%
rename from computers/shared/sddm.nix
rename to hosts/shared/sddm.nix
diff --git a/computers/shared/ssh.nix b/hosts/shared/ssh.nix
similarity index 100%
rename from computers/shared/ssh.nix
rename to hosts/shared/ssh.nix
diff --git a/computers/shared/support.nix b/hosts/shared/support.nix
similarity index 100%
rename from computers/shared/support.nix
rename to hosts/shared/support.nix
diff --git a/computers/shared/users.nix b/hosts/shared/users.nix
similarity index 100%
rename from computers/shared/users.nix
rename to hosts/shared/users.nix
diff --git a/computers/shared/xonsh.nix b/hosts/shared/xonsh.nix
similarity index 100%
rename from computers/shared/xonsh.nix
rename to hosts/shared/xonsh.nix
diff --git a/lib/default.nix b/lib/default.nix
index 1ea2da7..849c612 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,8 +1,7 @@
 {inputs}: _: _: let
-  mkComputer = {
+  mkHost = {
     host,
     system,
-    user,
     extraModules ? [],
   }:
     inputs.nixpkgs.lib.nixosSystem {
@@ -10,7 +9,7 @@
       modules =
         extraModules
         ++ [
-          ../computers/${host}
+          ../hosts/${host}
           inputs.self.nixosModules.default
           ({config, ...}: {
             config = {
@@ -43,5 +42,5 @@
       };
     };
 in {
-  mkComputers = computers: builtins.mapAttrs (n: v: mkComputer (v // {host = n;})) computers;
+  mkHosts = builtins.mapAttrs (n: v: mkHost (v // {host = n;}));
 }