diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 856dc7ec04d6..6eb4675a69c8 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -112,7 +112,7 @@ let
 
         # Add your own options below and run "nixos-rebuild switch".
         # E.g.,
-        #   services.sshd.enable = true;
+        #   services.openssh.enable = true;
       }
     '';
   
@@ -246,6 +246,6 @@ in
   # Allow sshd to be started manually through "start sshd".  It should
   # not be started by default on the installation CD because the
   # default root password is empty.
-  services.sshd.enable = true;
+  services.openssh.enable = true;
   jobs.sshd.startOn = pkgs.lib.mkOverride 50 {} "";
 }
diff --git a/modules/installer/cd-dvd/installation-cd-minimal.nix b/modules/installer/cd-dvd/installation-cd-minimal.nix
index ae520e641016..4d85b7c8a80c 100644
--- a/modules/installer/cd-dvd/installation-cd-minimal.nix
+++ b/modules/installer/cd-dvd/installation-cd-minimal.nix
@@ -9,7 +9,7 @@
   installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal.nix";
 
   # Don't include X libraries.
-  services.sshd.forwardX11 = false;
+  services.openssh.forwardX11 = false;
   services.dbus.enable = false; # depends on libX11
   services.hal.enable = false; # depends on dbus
   fonts.enableFontConfig = false;
diff --git a/modules/installer/cd-dvd/installation-cd-rescue.nix b/modules/installer/cd-dvd/installation-cd-rescue.nix
index dd3a72c49c68..9db626e5a9dd 100644
--- a/modules/installer/cd-dvd/installation-cd-rescue.nix
+++ b/modules/installer/cd-dvd/installation-cd-rescue.nix
@@ -9,7 +9,7 @@
   installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal.nix";
 
   # Don't include X libraries.
-  services.sshd.forwardX11 = false;
+  services.openssh.forwardX11 = false;
   services.dbus.enable = false; # depends on libX11
   services.hal.enable = false; # depends on dbus
   fonts.enableFontConfig = false;
diff --git a/modules/installer/cd-dvd/system-tarball-pc.nix b/modules/installer/cd-dvd/system-tarball-pc.nix
index 7774876447b4..3245a8c34b3e 100644
--- a/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -22,7 +22,7 @@ let
 
         # Add your own options below and run "nixos-rebuild switch".
         # E.g.,
-        #   services.sshd.enable = true;
+        #   services.openssh.enable = true;
       }
     '';
   
@@ -173,6 +173,6 @@ in
   # Allow sshd to be started manually through "start sshd".  It should
   # not be started by default on the installation CD because the
   # default root password is empty.
-  services.sshd.enable = true;
+  services.openssh.enable = true;
   jobs.sshd.startOn = pkgs.lib.mkOverride 50 {} "";
 }
diff --git a/modules/programs/ssh.nix b/modules/programs/ssh.nix
index c325a4bea34d..ce07c4f3b321 100644
--- a/modules/programs/ssh.nix
+++ b/modules/programs/ssh.nix
@@ -7,7 +7,7 @@
     [ { # SSH configuration.  Slight duplication of the sshd_config
         # generation in the sshd service.
         source = pkgs.writeText "ssh_config" ''
-          ${if config.services.sshd.forwardX11 then ''
+          ${if config.services.openssh.forwardX11 then ''
             ForwardX11 yes
             XAuthLocation ${pkgs.xorg.xauth}/bin/xauth
           '' else ''
diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 38812754a693..e0fef5185929 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -123,7 +123,7 @@ in
         target = "ssh/moduli";
       };
 
-    jobs.openssh = {
+    jobs.sshd = {
 
         description = "OpenSSH server";
 
diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index f314f5228874..acb0c22ab61c 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -83,8 +83,8 @@ with pkgs.lib;
 
   # Allow root logins only using the SSH key that the user specified
   # at instance creation time.
-  services.sshd.enable = true;
-  services.sshd.permitRootLogin = "without-password";
+  services.openssh.enable = true;
+  services.openssh.permitRootLogin = "without-password";
 
   # Obtain the SSH key and host name at startup time.
   jobs.fetchEC2Data =
diff --git a/tests/proxy.nix b/tests/proxy.nix
index 81833060d438..685d5a36f5d5 100644
--- a/tests/proxy.nix
+++ b/tests/proxy.nix
@@ -6,7 +6,7 @@ let
     { config, pkgs, ... }:
 
     {
-      services.sshd.enable = true;
+      services.openssh.enable = true;
 
       services.httpd.enable = true;
       services.httpd.adminAddr = "foo@example.org";
diff --git a/tests/test-nixos-install-from-cd/module-insecure.nix b/tests/test-nixos-install-from-cd/module-insecure.nix
index 68240204ff29..03bbc8e515a9 100644
--- a/tests/test-nixos-install-from-cd/module-insecure.nix
+++ b/tests/test-nixos-install-from-cd/module-insecure.nix
@@ -11,7 +11,7 @@ in
 
 {
 
-  services.sshd = {
+  services.openssh = {
     enable = true;
     permitRootLogin = "yes";
   };
diff --git a/tests/trac.nix b/tests/trac.nix
index b9b73ad673e1..837e1de5da88 100644
--- a/tests/trac.nix
+++ b/tests/trac.nix
@@ -16,7 +16,7 @@
     postgresql =
       {config, pkgs, ...}:
       {
-        services.sshd.enable = true;
+        services.openssh.enable = true;
         services.postgresql.enable = true;
         services.postgresql.enableTCPIP = true;
         services.postgresql.authentication = ''