diff --git a/modules/users/group.nix b/modules/users/group.nix
index 0e74085..da3feb1 100644
--- a/modules/users/group.nix
+++ b/modules/users/group.nix
@@ -1,11 +1,12 @@
 { name, lib, ... }:
 
-with lib;
-
 {
-  options = {
+  options = let
+    inherit (lib) mkOption types;
+  in {
     name = mkOption {
       type = types.str;
+      default = name;
       description = ''
         The group's name. If undefined, the name of the attribute set
         will be used.
@@ -29,10 +30,4 @@ with lib;
       description = "The group's description.";
     };
   };
-
-  config = {
-
-    name = mkDefault name;
-
-  };
 }
diff --git a/modules/users/user.nix b/modules/users/user.nix
index 4e3f1c9..363c300 100644
--- a/modules/users/user.nix
+++ b/modules/users/user.nix
@@ -1,11 +1,12 @@
 { name, lib, ... }:
 
-with lib;
-
 {
-  options = {
+  options = let
+    inherit (lib) literalExpression mkOption types;
+  in {
     name = mkOption {
       type = types.str;
+      default = name;
       description = ''
         The name of the user account. If undefined, the name of the
         attribute set will be used.
@@ -75,10 +76,4 @@ with lib;
       '';
     };
   };
-
-  config = {
-
-    name = mkDefault name;
-
-  };
 }