diff --git a/modules/system/defaults-write.nix b/modules/system/defaults-write.nix
index 9bf19635..9502f429 100644
--- a/modules/system/defaults-write.nix
+++ b/modules/system/defaults-write.nix
@@ -29,7 +29,7 @@ let
   GlobalPreferences = defaultsToList ".GlobalPreferences" cfg.".GlobalPreferences";
   LaunchServices = defaultsToList "com.apple.LaunchServices" cfg.LaunchServices;
   NSGlobalDomain = defaultsToList "-g" cfg.NSGlobalDomain;
-  clock = defaultsToList "com.apple.menuextra.clock" cfg.clock;
+  menuExtraClock = defaultsToList "com.apple.menuextra.clock" cfg.menuExtraClock;
   dock = defaultsToList "com.apple.dock" cfg.dock;
   finder = defaultsToList "com.apple.finder" cfg.finder;
   magicmouse = defaultsToList "com.apple.AppleMultitouchMouse" cfg.magicmouse;
@@ -81,7 +81,7 @@ in
         GlobalPreferences
         LaunchServices
         NSGlobalDomain
-        clock
+        menuExtraClock
         dock
         finder
         magicmouse
@@ -103,7 +103,7 @@ in
 
         ${concatStringsSep "\n" GlobalPreferences}
         ${concatStringsSep "\n" LaunchServices}
-        ${concatStringsSep "\n" clock}
+        ${concatStringsSep "\n" menuExtraClock}
         ${concatStringsSep "\n" dock}
         ${concatStringsSep "\n" finder}
         ${concatStringsSep "\n" magicmouse}
diff --git a/modules/system/defaults/clock.nix b/modules/system/defaults/clock.nix
index 9ec0471b..ef2cac48 100644
--- a/modules/system/defaults/clock.nix
+++ b/modules/system/defaults/clock.nix
@@ -5,7 +5,7 @@ with lib;
 {
   options = {
 
-    system.defaults.clock.IsAnalog = mkOption {
+    system.defaults.menuExtraClock.IsAnalog = mkOption {
       type = types.nullOr types.bool;
       default = null;
       description = ''
@@ -13,7 +13,7 @@ with lib;
       '';
     };
 
-    system.defaults.clock.Show24Hour = mkOption {
+    system.defaults.menuExtraClock.Show24Hour = mkOption {
       type = types.nullOr types.bool;
       default = null;
       description = ''
@@ -21,7 +21,7 @@ with lib;
       '';
     };
 
-    system.defaults.clock.ShowAMPM = mkOption {
+    system.defaults.menuExtraClock.ShowAMPM = mkOption {
       type = types.nullOr types.bool;
       default = null;
       description = ''
@@ -29,7 +29,7 @@ with lib;
       '';
     };
 
-    system.defaults.clock.ShowDayOfMonth = mkOption {
+    system.defaults.menuExtraClock.ShowDayOfMonth = mkOption {
       type = types.nullOr types.bool;
       default = null;
       description = ''
@@ -37,7 +37,7 @@ with lib;
       '';
     };
 
-    system.defaults.clock.ShowDayOfWeek = mkOption {
+    system.defaults.menuExtraClock.ShowDayOfWeek = mkOption {
       type = types.nullOr types.bool;
       default = null;
       description = ''
@@ -45,7 +45,7 @@ with lib;
       '';
     };
 
-    system.defaults.clock.ShowDate = mkOption {
+    system.defaults.menuExtraClock.ShowDate = mkOption {
       type = types.nullOr (types.enum [ 0 1 2 ]);
       default = null;
       description = ''
@@ -59,7 +59,7 @@ with lib;
       '';
     };
 
-    system.defaults.clock.ShowSeconds = mkOption {
+    system.defaults.menuExtraClock.ShowSeconds = mkOption {
       type = types.nullOr types.bool;
       default = null;
       description = ''
diff --git a/tests/system-defaults-write.nix b/tests/system-defaults-write.nix
index 5ba4ae54..1c21ca85 100644
--- a/tests/system-defaults-write.nix
+++ b/tests/system-defaults-write.nix
@@ -37,9 +37,9 @@
   system.defaults.NSGlobalDomain."com.apple.springing.delay" = 0.0;
   system.defaults.NSGlobalDomain."com.apple.swipescrolldirection" = true;
   system.defaults.".GlobalPreferences"."com.apple.sound.beep.sound" = "/System/Library/Sounds/Funk.aiff";
-  system.defaults.clock.Show24Hour = false;
-  system.defaults.clock.ShowDayOfWeek = true;
-  system.defaults.clock.ShowDate = 2;
+  system.defaults.menuExtraClock.Show24Hour = false;
+  system.defaults.menuExtraClock.ShowDayOfWeek = true;
+  system.defaults.menuExtraClock.ShowDate = 2;
   system.defaults.dock.appswitcher-all-displays = false;
   system.defaults.dock.autohide-delay = 0.24;
   system.defaults.dock.orientation = "left";