diff --git a/minimal/flake.nix b/minimal/flake.nix
index 124ff99..9623687 100644
--- a/minimal/flake.nix
+++ b/minimal/flake.nix
@@ -31,7 +31,7 @@
 
     homeConfigurations = {
       # FIXME replace with your username@hostname
-      "your-name@your-hostname" = home-manager.lib.homeManagerConfiguration {
+      "your-username@your-hostname" = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages.x86_64-linux;
 
         modules = [ ./home-manager/home.nix ];
diff --git a/minimal/home-manager/home.nix b/minimal/home-manager/home.nix
index a7af0ad..1891b22 100644
--- a/minimal/home-manager/home.nix
+++ b/minimal/home-manager/home.nix
@@ -14,8 +14,8 @@
 
   # TODO: Set your username
   home = {
-    username = "your-name";
-    homeDirectory = "/home/your-name";
+    username = "your-username";
+    homeDirectory = "/home/your-username";
   };
 
   # Add stuff for your user as you see fit:
diff --git a/minimal/nixos/configuration.nix b/minimal/nixos/configuration.nix
index 3bd757e..52a6006 100644
--- a/minimal/nixos/configuration.nix
+++ b/minimal/nixos/configuration.nix
@@ -51,7 +51,7 @@
   # TODO: Configure your system-wide user settings (groups, etc), add more users as needed.
   users.users = {
     # FIXME: Replace with your username
-    your-name = {
+    your-username = {
       # TODO: You can set an initial password for your user.
       # If you do, you can skip setting a root password by passing '--no-root-passwd' to nixos-install.
       # Be sure to change it (using passwd) after rebooting!
diff --git a/standard/flake.nix b/standard/flake.nix
index 054ee9b..0790034 100644
--- a/standard/flake.nix
+++ b/standard/flake.nix
@@ -73,7 +73,7 @@
 
       homeConfigurations = {
         # FIXME replace with your username@hostname
-        "your-name@your-hostname" = home-manager.lib.homeManagerConfiguration {
+        "your-username@your-hostname" = home-manager.lib.homeManagerConfiguration {
           pkgs = legacyPackages.x86_64-linux;
 
           modules = [
diff --git a/standard/home-manager/home.nix b/standard/home-manager/home.nix
index a7af0ad..1891b22 100644
--- a/standard/home-manager/home.nix
+++ b/standard/home-manager/home.nix
@@ -14,8 +14,8 @@
 
   # TODO: Set your username
   home = {
-    username = "your-name";
-    homeDirectory = "/home/your-name";
+    username = "your-username";
+    homeDirectory = "/home/your-username";
   };
 
   # Add stuff for your user as you see fit:
diff --git a/standard/nixos/configuration.nix b/standard/nixos/configuration.nix
index 3bd757e..52a6006 100644
--- a/standard/nixos/configuration.nix
+++ b/standard/nixos/configuration.nix
@@ -51,7 +51,7 @@
   # TODO: Configure your system-wide user settings (groups, etc), add more users as needed.
   users.users = {
     # FIXME: Replace with your username
-    your-name = {
+    your-username = {
       # TODO: You can set an initial password for your user.
       # If you do, you can skip setting a root password by passing '--no-root-passwd' to nixos-install.
       # Be sure to change it (using passwd) after rebooting!