diff --git a/modules/services/logging/syslogd.nix b/modules/services/logging/syslogd.nix
index a3aff9a30d3..2b7e4a8e44c 100644
--- a/modules/services/logging/syslogd.nix
+++ b/modules/services/logging/syslogd.nix
@@ -105,7 +105,7 @@ in
     services.syslogd.extraParams = optional cfg.enableNetworkInput "-r";
 
     # FIXME: restarting syslog seems to break journal logging.
-    boot.systemd.services."syslog.service" =
+    boot.systemd.services.syslog =
       { description = "Syslog daemon";
       
         requires = [ "syslog.socket" ];
diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 79323287258..cf2d0f52d86 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -248,7 +248,7 @@ in
           '';
       };
      
-    boot.systemd.services."nix-daemon.service" =
+    boot.systemd.services."nix-daemon" =
       { description = "Nix Daemon";
 
         path = [ nix pkgs.openssl pkgs.utillinux ]
diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 6ad79ca72a8..242129c355e 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -314,7 +314,7 @@ in
       }
     ];
 
-    boot.systemd.services."set-ssh-keys.service" =
+    boot.systemd.services."set-ssh-keys" =
       { description = "Update authorized SSH keys";
 
         wantedBy = [ "multi-user.target" ];
@@ -328,7 +328,7 @@ in
           '';
       };
 
-    boot.systemd.services."sshd.service" =
+    boot.systemd.services.sshd =
       { description = "SSH Daemon";
 
         wantedBy = [ "multi-user.target" ];
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index fddffbcf0a6..992911ca3c4 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -379,7 +379,7 @@ in
 
     boot.systemd.defaultUnit = mkIf cfg.autorun "graphical.target";
 
-    boot.systemd.services."display-manager.service" =
+    boot.systemd.services."display-manager" =
       { after = [ "systemd-udev-settle.service" ];
 
         restartIfChanged = false;
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 2045e702fe9..918c0571ab4 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -358,7 +358,7 @@ in
     boot.systemd.units =
       { "rescue.service".text = rescueService; }
       // { "fs.target" = { text = fsTarget; wantedBy = [ "multi-user.target" ]; }; }
-      // mapAttrs serviceToUnit cfg.services;
+      // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.services;
 
   };
 
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index c00bc03c66f..fbbbf72e027 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -297,7 +297,7 @@ in
 
     boot.systemd.services =
       flip mapAttrs' config.jobs (name: job:
-        nameValuePair "${job.name}.service" job.unit);
+        nameValuePair job.name job.unit);
 
   };
 
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index facfe29a4b0..efce3153c88 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -11,7 +11,7 @@ let kernel = config.boot.kernelPackages.kernel; in
 
   config = {
 
-    boot.systemd.services."backdoor.service" =
+    boot.systemd.services.backdoor =
       { wantedBy = [ "multi-user.target" ];
         requires = [ "dev-hvc0.device" ];
         after = [ "dev-hvc0.device" ];
diff --git a/modules/virtualisation/virtualbox-guest.nix b/modules/virtualisation/virtualbox-guest.nix
index e864c125176..03234fbb82f 100644
--- a/modules/virtualisation/virtualbox-guest.nix
+++ b/modules/virtualisation/virtualbox-guest.nix
@@ -39,7 +39,7 @@ if (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) then
     boot.extraModulePackages = [ kernel.virtualboxGuestAdditions ];
 
     jobs.virtualbox =
-      { description = "VirtualBox service";
+      { description = "VirtualBox Guest Services";
 
         wantedBy = [ "multi-user.target" ];
         requires = [ "dev-vboxguest.device" ];