diff --git a/devices/jykang.xmuhpc/default.nix b/devices/jykang/default.nix
similarity index 100%
rename from devices/jykang.xmuhpc/default.nix
rename to devices/jykang/default.nix
diff --git a/devices/jykang.xmuhpc/files/.bash_logout b/devices/jykang/files/.bash_logout
similarity index 100%
rename from devices/jykang.xmuhpc/files/.bash_logout
rename to devices/jykang/files/.bash_logout
diff --git a/devices/jykang.xmuhpc/files/.bash_profile b/devices/jykang/files/.bash_profile
similarity index 100%
rename from devices/jykang.xmuhpc/files/.bash_profile
rename to devices/jykang/files/.bash_profile
diff --git a/devices/jykang.xmuhpc/files/.bashrc b/devices/jykang/files/.bashrc
similarity index 100%
rename from devices/jykang.xmuhpc/files/.bashrc
rename to devices/jykang/files/.bashrc
diff --git a/devices/jykang.xmuhpc/files/.config/nix/nix.conf b/devices/jykang/files/.config/nix/nix.conf
similarity index 100%
rename from devices/jykang.xmuhpc/files/.config/nix/nix.conf
rename to devices/jykang/files/.config/nix/nix.conf
diff --git a/devices/jykang.xmuhpc/files/.ssh/authorized_keys b/devices/jykang/files/.ssh/authorized_keys
similarity index 100%
rename from devices/jykang.xmuhpc/files/.ssh/authorized_keys
rename to devices/jykang/files/.ssh/authorized_keys
diff --git a/devices/jykang.xmuhpc/files/.vaspkit b/devices/jykang/files/.vaspkit
similarity index 100%
rename from devices/jykang.xmuhpc/files/.vaspkit
rename to devices/jykang/files/.vaspkit
diff --git a/devices/jykang.xmuhpc/files/linwei/chn/software/hpcstat/bin/bsub b/devices/jykang/files/linwei/chn/software/hpcstat/bin/bsub
similarity index 100%
rename from devices/jykang.xmuhpc/files/linwei/chn/software/hpcstat/bin/bsub
rename to devices/jykang/files/linwei/chn/software/hpcstat/bin/bsub
diff --git a/devices/srv2/node0/default.nix b/devices/srv2/node0/default.nix
index e6bdecbd..6ef3cc3e 100644
--- a/devices/srv2/node0/default.nix
+++ b/devices/srv2/node0/default.nix
@@ -20,7 +20,7 @@ inputs:
           swap = [ "/dev/disk/by-partlabel/srv2-node0-swap" ];
           mount.btrfs."/dev/disk/by-partlabel/srv2-node0-root1" =
           {
-            "/nix/remote/jykang.xmuhpc" = "/data/gpfs01/jykang/.nix";
+            "/nix/remote/jykang" = "/data/gpfs01/jykang/.nix";
             "/nix/remote/xmuhk" = "/public/home/xmuhk/.nix";
           };
         };
diff --git a/devices/wlin.xmuhpc/default.nix b/devices/wlin/default.nix
similarity index 100%
rename from devices/wlin.xmuhpc/default.nix
rename to devices/wlin/default.nix
diff --git a/devices/wlin.xmuhpc/files/.bash_profile b/devices/wlin/files/.bash_profile
similarity index 100%
rename from devices/wlin.xmuhpc/files/.bash_profile
rename to devices/wlin/files/.bash_profile
diff --git a/devices/wlin.xmuhpc/files/.bashrc b/devices/wlin/files/.bashrc
similarity index 100%
rename from devices/wlin.xmuhpc/files/.bashrc
rename to devices/wlin/files/.bashrc
diff --git a/flake/packages.nix b/flake/packages.nix
index 14fd9d21..eae0de58 100644
--- a/flake/packages.nix
+++ b/flake/packages.nix
@@ -28,8 +28,8 @@
     gfortran = pkgs.pkgsStatic.gfortran;
     lapack = pkgs.pkgsStatic.openblas;
   };
-  jykang = import ../devices/jykang.xmuhpc { inherit inputs localLib; };
-  wlin = import ../devices/wlin.xmuhpc { inherit inputs localLib; };
+  jykang = import ../devices/jykang { inherit inputs localLib; };
+  wlin = import ../devices/wlin { inherit inputs localLib; };
   xmuhk = import ../devices/xmuhk { inherit inputs localLib; };
   src =
     let getDrv = x:
diff --git a/modules/services/hpcstat.nix b/modules/services/hpcstat.nix
index 62a7d343..85c3fe22 100644
--- a/modules/services/hpcstat.nix
+++ b/modules/services/hpcstat.nix
@@ -22,7 +22,7 @@ inputs:
             ssh = "${inputs.pkgs.openssh}/bin/ssh -i ${key} -o StrictHostKeyChecking=no"
               + " -o ForwardAgent=yes -o AddKeysToAgent=yes";
             key = inputs.config.nixos.system.sops.secrets."hpcstat/key".path;
-            jykang = "${inputs.topInputs.self}/devices/jykang.xmuhpc/files";
+            jykang = "${inputs.topInputs.self}/devices/jykang/files";
             ssh-agent = "${inputs.pkgs.openssh}/bin/ssh-agent";
           in
           {