diff --git a/hosts/tohru/home.nix b/hosts/tohru/home.nix
index e62fc71..77f400b 100644
--- a/hosts/tohru/home.nix
+++ b/hosts/tohru/home.nix
@@ -1,10 +1,9 @@
 { config, lib, pkgs, ... }:
 
 {
-  users.users.bluebird = {
+  users.users.qenya = {
     isNormalUser = true;
-    home = "/home/bluebird";
-    description = "Bluebird";
+    home = "/home/qenya";
     extraGroups = [
       "wheel" # sudo
       "networkmanager" # UI wifi configuration
@@ -18,8 +17,8 @@
     ];
   };
 
-  home-manager.users.bluebird = { pkgs, ... }: {
-    home.homeDirectory = config.users.users.bluebird.home;
+  home-manager.users.qenya = { pkgs, ... }: {
+    home.homeDirectory = config.users.users.qenya.home;
 
     home.packages = with pkgs; [
       fortune
@@ -37,7 +36,7 @@
           backgroundOptions = {
             color-shading-type = "solid";
             picture-options = "zoom";
-            picture-uri = "${config.users.users.bluebird.home}/.background-image";
+            picture-uri = "${config.users.users.qenya.home}/.background-image";
             primary-color = "#3a4ba0";
             secondary-color = "#2f302f";
           };
diff --git a/hosts/yevaud/configuration.nix b/hosts/yevaud/configuration.nix
index 89f7bd0..310b37e 100644
--- a/hosts/yevaud/configuration.nix
+++ b/hosts/yevaud/configuration.nix
@@ -14,11 +14,11 @@
 
   time.timeZone = "Etc/UTC";
 
-  users.users.bluebird = {
+  users.users.qenya = {
     isNormalUser = true;
     extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
     openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJEmkV9arotms79lJPsLHkdzAac4eu3pYS08ym0sB/on bluebird@tohru"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJEmkV9arotms79lJPsLHkdzAac4eu3pYS08ym0sB/on qenya@tohru"
     ];
   };
 
@@ -32,7 +32,7 @@
 
   # Allow remote root login only from home network
   # TODO: Find a less hacky way of doing remote deployment
-  users.users.root.openssh.authorizedKeys.keys = config.users.users.bluebird.openssh.authorizedKeys.keys;
+  users.users.root.openssh.authorizedKeys.keys = config.users.users.qenya.openssh.authorizedKeys.keys;
   services.openssh.extraConfig = "Match Address 45.14.17.200\n    PermitRootLogin prohibit-password";
 
   networking.firewall.allowedTCPPorts = [ 22 80 443 ];