diff --git a/modules/config/swap.nix b/modules/config/swap.nix
index 222c18d3e629..a0287c948af1 100644
--- a/modules/config/swap.nix
+++ b/modules/config/swap.nix
@@ -26,7 +26,7 @@ with utils;
         recommended.
       '';
 
-      type = types.list types.optionSet;
+      type = types.listOf types.optionSet;
 
       options = {config, options, ...}: {
 
diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 11d443e48861..f3ebf0a34188 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -221,7 +221,7 @@ in
 
       binaryCaches = mkOption {
         default = [ http://nixos.org/binary-cache ];
-        type = types.list types.string;
+        type = types.listOf types.string;
         description = ''
           List of binary cache URLs used to obtain pre-built binaries
           of Nix packages.
@@ -231,7 +231,7 @@ in
       trustedBinaryCaches = mkOption {
         default = [ ];
         example = [ http://hydra.nixos.org/ ];
-        type = types.list types.string;
+        type = types.listOf types.string;
         description = ''
           List of binary cache URLs that non-root users can use (in
           addition to those specified using
diff --git a/modules/services/monitoring/smartd.nix b/modules/services/monitoring/smartd.nix
index 71eb6b99ed3b..3f065666ea29 100644
--- a/modules/services/monitoring/smartd.nix
+++ b/modules/services/monitoring/smartd.nix
@@ -85,7 +85,7 @@ in
       devices = mkOption {
         default = [];
         example = [ { device = "/dev/sda"; } { device = "/dev/sdb"; options = "-d sat"; } ];
-        type = types.list types.optionSet;
+        type = types.listOf types.optionSet;
         options = [ smartdOpts ];
         description = ''
           List of devices to monitor. By default -- if this list is empty --,
diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index 7bc09a7b4044..c47210c7cefb 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -108,7 +108,7 @@ in
     };
 
     networking.firewall.trustedInterfaces = mkOption {
-      type = types.list types.string;
+      type = types.listOf types.string;
       description =
         ''
           Traffic coming in from these interfaces will be accepted
@@ -119,7 +119,7 @@ in
     networking.firewall.allowedTCPPorts = mkOption {
       default = [];
       example = [ 22 80 ];
-      type = types.list types.int;
+      type = types.listOf types.int;
       description =
         ''
           List of TCP ports on which incoming connections are
@@ -130,7 +130,7 @@ in
     networking.firewall.allowedUDPPorts = mkOption {
       default = [];
       example = [ 53 ];
-      type = types.list types.int;
+      type = types.listOf types.int;
       description =
         ''
           List of open UDP ports.
@@ -168,7 +168,7 @@ in
     networking.firewall.connectionTrackingModules = mkOption {
       default = [ "ftp" ];
       example = [ "ftp" "irc" "sane" "sip" "tftp" "amanda" "h323" "netbios_sn" "pptp" "snmp" ];
-      type = types.list types.string;
+      type = types.listOf types.string;
       description =
         ''
           List of connection-tracking helpers that are auto-loaded.
diff --git a/modules/services/networking/xinetd.nix b/modules/services/networking/xinetd.nix
index 3727e85816ca..626183b810f1 100644
--- a/modules/services/networking/xinetd.nix
+++ b/modules/services/networking/xinetd.nix
@@ -67,7 +67,7 @@ in
         A list of services provided by xinetd.
       '';
 
-      type = types.list types.optionSet;
+      type = types.listOf types.optionSet;
 
       options = {
 
diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index f4bf0d3f2c64..58f4d74c20e5 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -55,7 +55,7 @@ in
       };
 
       phononBackends = mkOption {
-        type = types.list types.string;
+        type = types.listOf types.string;
         default = ["gstreamer"];
         example = ["gstreamer" "vlc"];
         description = "Which phonon multimedia backend kde should use";
@@ -65,7 +65,7 @@ in
     environment.kdePackages = mkOption {
       default = [];
       example = "[ pkgs.kde4.kdesdk ]";
-      type = types.list types.package;
+      type = types.listOf types.package;
       description = "This option is obsolete.  Please use <option>environment.systemPackages</option> instead.";
     };
 
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 643fc42dc626..d5277d3cd03e 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -384,7 +384,7 @@ in
 
     environment.x11Packages = mkOption {
       default = [];
-      type = types.list types.package;
+      type = types.listOf types.package;
       description = ''
         List of packages added to the system when the X server is
         activated (<option>services.xserver.enable</option>).
diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix
index a514b08a6a8d..8f48bba880b2 100644
--- a/modules/system/boot/luksroot.nix
+++ b/modules/system/boot/luksroot.nix
@@ -84,7 +84,7 @@ in
         Make sure that initrd has the crypto modules needed for decryption.
       '';
 
-      type = types.list types.optionSet;
+      type = types.listOf types.optionSet;
 
       options = {
 
diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 52f8e9b6ddfa..a95bb0673a23 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -118,14 +118,14 @@ in
     boot.supportedFilesystems = mkOption {
       default = [ ];
       example = [ "btrfs" ];
-      type = types.list types.string;
+      type = types.listOf types.string;
       description = "Names of supported filesystem types.";
     };
 
     boot.initrd.supportedFilesystems = mkOption {
       default = [ ];
       example = [ "btrfs" ];
-      type = types.list types.string;
+      type = types.listOf types.string;
       description = "Names of supported filesystem types in the initial ramdisk.";
     };