diff --git a/modules/rename.nix b/modules/rename.nix
index a3b40da42134..77470d932004 100644
--- a/modules/rename.nix
+++ b/modules/rename.nix
@@ -71,6 +71,9 @@ in zipModules ([]
 ++ rename obsolete "boot.bootMount" to "boot.loader.grub.bootDevice"
 ++ rename obsolete "boot.grubSplashImage" to "boot.loader.grub.splashImage"
 
+# X11
+++ rename obsolete "services.xserver.startSSHAgent" to "services.xserver.startOpenSSHAgent"
+
 # KDE
 ++ rename deprecated "kde.extraPackages" to "environment.kdePackages"
 
diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index 7cc270cf247b..805016fe438f 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -32,7 +32,7 @@ let
         exec > ~/.xsession-errors 2>&1
       ''}
 
-      ${optionalString cfg.startSSHAgent ''
+      ${optionalString cfg.startOpenSSHAgent ''
         if test -z "$SSH_AUTH_SOCK"; then
             # Restart this script as a child of the SSH agent.  (It is
             # also possible to start the agent as a child that prints
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 62fb26f829e9..1ea26c5af0ac 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -198,10 +198,10 @@ in
         '';
       };
 
-      startSSHAgent = mkOption {
+      startOpenSSHAgent = mkOption {
         default = true;
         description = ''
-          Whether to start the SSH agent when you log in.  The SSH agent
+          Whether to start the OpenSSH agent when you log in.  The OpenSSH agent
           remembers private keys for you so that you don't have to type in
           passphrases every time you make an SSH connection.  Use
           <command>ssh-add</command> to add a key to the agent.
@@ -340,14 +340,14 @@ in
           message = "The X server needs HAL running. Set services.hal.enable to true";
         }
 
-        { assertion = if cfg.startSSHAgent
+        { assertion = if cfg.startOpenSSHAgent
                       then !cfg.startGnuPGAgent
                       else (if cfg.startGnuPGAgent
-                            then !cfg.startSSHAgent
+                            then !cfg.startOpenSSHAgent
                             else true);
           message =
             "The OpenSSH agent and GnuPG agent cannot be started both.  "
-            "Choose between `startSSHAgent' and `startGnuPGAgent'.";
+            "Choose between `startOpenSSHAgent' and `startGnuPGAgent'.";
         }
       ];