diff --git a/flake.nix b/flake.nix
index eeddc8f..a4d4eaf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,30 +19,30 @@
 
   outputs = inputs@{ self, nix-darwin, nixpkgs, home-manager, nixvim, claude-code, firefox-addons, nix-homebrew }:
   {
-    darwinConfigurations."iMac" = nix-darwin.lib.darwinSystem {
+    darwinConfigurations."imac" = nix-darwin.lib.darwinSystem {
       modules = [ 
-        ./hosts/darwin/iMac/system.nix
+        ./hosts/darwin/imac/system.nix
       ];
       specialArgs = { inherit nix-homebrew; };
     };
 
-    darwinConfigurations."MacBook-Air" = nix-darwin.lib.darwinSystem {
+    darwinConfigurations."mba" = nix-darwin.lib.darwinSystem {
       modules = [ 
-        ./hosts/darwin/MacBook-Air/system.nix
+        ./hosts/darwin/mba/system.nix
       ];
       specialArgs = { inherit nix-homebrew; };
     };
 
     homeConfigurations = {
-      "yanlin@iMac" = home-manager.lib.homeManagerConfiguration {
+      "yanlin@imac" = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages.aarch64-darwin;
-        modules = [ ./hosts/darwin/iMac/home.nix ];
+        modules = [ ./hosts/darwin/imac/home.nix ];
         extraSpecialArgs = { inherit claude-code nixvim firefox-addons; };
       };
 
-      "yanlin@MacBook-Air" = home-manager.lib.homeManagerConfiguration {
+      "yanlin@mba" = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages.aarch64-darwin;
-        modules = [ ./hosts/darwin/MacBook-Air/home.nix ];
+        modules = [ ./hosts/darwin/mba/home.nix ];
         extraSpecialArgs = { inherit claude-code nixvim firefox-addons; };
       };
     };
diff --git a/hosts/darwin/iMac/system.nix b/hosts/darwin/iMac/system.nix
index 5df8cb9..27b2bcb 100644
--- a/hosts/darwin/iMac/system.nix
+++ b/hosts/darwin/iMac/system.nix
@@ -2,8 +2,8 @@
 
 {
   # iMac-specific configuration
-  networking.computerName = "iMac";
-  networking.hostName = "iMac";
+  networking.computerName = "imac";
+  networking.hostName = "imac";
   
   # Import common Darwin configuration
   imports = [
diff --git a/hosts/darwin/MacBook-Air/home.nix b/hosts/darwin/mba/home.nix
similarity index 100%
rename from hosts/darwin/MacBook-Air/home.nix
rename to hosts/darwin/mba/home.nix
diff --git a/hosts/darwin/MacBook-Air/system.nix b/hosts/darwin/mba/system.nix
similarity index 65%
rename from hosts/darwin/MacBook-Air/system.nix
rename to hosts/darwin/mba/system.nix
index 41f0479..396d64f 100644
--- a/hosts/darwin/MacBook-Air/system.nix
+++ b/hosts/darwin/mba/system.nix
@@ -2,8 +2,8 @@
 
 {
   # MacBook Air-specific configuration
-  networking.computerName = "MacBook-Air";
-  networking.hostName = "MacBook-Air";
+  networking.computerName = "mba";
+  networking.hostName = "mba";
   
   # Import common Darwin configuration
   imports = [