diff --git a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
index 85356118ce6..13ed95d4ceb 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
@@ -152,7 +152,7 @@ in
   # default root password is empty.
   services.openssh.enable = true;
 
-  jobs.openssh.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
+  jobs.openssh.startOn = pkgs.lib.mkOverride 50 "";
 
   boot.loader.grub.enable = false;
   boot.loader.generationsDir.enable = false;
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-pc.nix b/nixos/modules/installer/cd-dvd/system-tarball-pc.nix
index 7619f074b74..b7965fc6e0b 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -109,7 +109,7 @@ in
   # not be started by default on the installation CD because the
   # default root password is empty.
   services.openssh.enable = true;
-  jobs.openssh.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
+  jobs.openssh.startOn = pkgs.lib.mkOverrideTemplate 50 "";
 
   # To be able to use the systemTarball to catch troubles.
   boot.crashDump = {
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index 20fe4de2cd8..7f253d595dc 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -165,7 +165,7 @@ in
   # not be started by default on the installation CD because the
   # default root password is empty.
   services.openssh.enable = true;
-  jobs.openssh.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
+  jobs.openssh.startOn = pkgs.lib.mkOverride 50 "";
 
   # cpufrequtils fails to build on non-pc
   powerManagement.enable = false;
diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix
index d1eb1799bc8..079fc054d19 100644
--- a/nixos/modules/services/x11/desktop-managers/kde4.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde4.nix
@@ -80,7 +80,7 @@ in
     # overridden by the user's configuration).
     # !!! doesn't work yet ("Multiple definitions. Only one is allowed
     # for this option.")
-    # services.xserver.desktopManager.default = mkOverrideTemplate 900 "kde4";
+    # services.xserver.desktopManager.default = mkOverride 900 "kde4";
 
     services.xserver.desktopManager.session = singleton
       { name = "kde4";
diff --git a/nixos/modules/system/activation/no-clone.nix b/nixos/modules/system/activation/no-clone.nix
index f15809e4d8b..c9ab691ce47 100644
--- a/nixos/modules/system/activation/no-clone.nix
+++ b/nixos/modules/system/activation/no-clone.nix
@@ -1,11 +1,9 @@
-# This configuration is not made to figure inside the module-list.nix to
-# allow clone of the first level.
 {pkgs, ...}:
 
 with pkgs.lib;
 
 {
-  boot.loader.grub.device = mkOverrideTemplate 0 {} "nodev";
-  nesting.children = mkOverrideTemplate 0 {} [];
-  nesting.clone = mkOverrideTemplate 0 {} [];
+  boot.loader.grub.device = mkOverride 0 "nodev";
+  nesting.children = mkOverride 0 [];
+  nesting.clone = mkOverride 0 [];
 }
diff --git a/nixos/tests/check-filesystems.nix b/nixos/tests/check-filesystems.nix
index 39e8883ee59..c1dae0ca621 100644
--- a/nixos/tests/check-filesystems.nix
+++ b/nixos/tests/check-filesystems.nix
@@ -40,7 +40,7 @@ rec {
             device = "share:/repos2";
             fsType = "nfs";
           };
-        in pkgs.lib.mkOverrideTemplate 50 {} [
+        in pkgs.lib.mkOverride 50 [
           repos1
           repos1 # check remount
           repos2 # check after remount
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index bebd6c04374..865b21d2444 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -14,7 +14,7 @@ let
         [ ../modules/installer/cd-dvd/installation-cd-graphical.nix
           ../modules/testing/test-instrumentation.nix
           { key = "serial";
-            boot.loader.grub.timeout = mkOverrideTemplate 0 {} 0;
+            boot.loader.grub.timeout = mkOverride 0 0;
 
             # The test cannot access the network, so any sources we
             # need must be included in the ISO.