diff --git a/modules/module-list.nix b/modules/module-list.nix
index 40c7e1c2f88..9463c15de6f 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -26,9 +26,9 @@
   ./programs/pwdutils/pwdutils.nix
   ./programs/ssh.nix
   ./programs/ssmtp.nix
-  ./security/console-kit.nix
+  ./security/consolekit.nix
   ./security/pam.nix
-  ./security/policy-kit.nix
+  ./security/polkit.nix
   ./security/setuid-wrappers.nix
   ./security/sudo.nix
   ./services/audio/alsa.nix
diff --git a/modules/security/console-kit.nix b/modules/security/consolekit.nix
similarity index 56%
rename from modules/security/console-kit.nix
rename to modules/security/consolekit.nix
index e172a8e4415..d1636d23378 100644
--- a/modules/security/console-kit.nix
+++ b/modules/security/consolekit.nix
@@ -6,15 +6,15 @@ with pkgs.lib;
 
   config = {
 
-    environment.systemPackages = [ pkgs.console_kit ];
+    environment.systemPackages = [ pkgs.consolekit ];
 
-    services.dbus.packages = [ pkgs.console_kit ];
+    services.dbus.packages = [ pkgs.consolekit ];
 
     environment.etc = singleton
       { source = (pkgs.buildEnv {
-          name = "console-kit-config";
+          name = "consolekit-config";
           pathsToLink = [ "/etc/ConsoleKit" ];
-          paths = [ pkgs.console_kit pkgs.udev ];
+          paths = [ pkgs.consolekit pkgs.udev ];
         }) + "/etc/ConsoleKit";
         target = "ConsoleKit";
       };
diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index 977ff0ae549..c8090ed691e 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -64,7 +64,7 @@ let
               "session optional ${pam_ldap}/lib/security/pam_ldap.so"}
           session required ${pam_unix2}/lib/security/pam_unix2.so
           ${optionalString ownDevices
-              "session optional ${pkgs.console_kit}/lib/security/pam_ck_connector.so"}
+              "session optional ${pkgs.consolekit}/lib/security/pam_ck_connector.so"}
           ${optionalString forwardXAuth
               "session optional pam_xauth.so xauthpath=${pkgs.xorg.xauth}/bin/xauth systemuser=99"}
         '';
diff --git a/modules/security/policy-kit.nix b/modules/security/polkit.nix
similarity index 74%
rename from modules/security/policy-kit.nix
rename to modules/security/polkit.nix
index 0299bc7d4c2..ed0496485cb 100644
--- a/modules/security/policy-kit.nix
+++ b/modules/security/polkit.nix
@@ -6,9 +6,9 @@ with pkgs.lib;
 
   config = {
 
-    environment.systemPackages = [ pkgs.policy_kit ];
+    environment.systemPackages = [ pkgs.polkit ];
 
-    services.dbus.packages = [ pkgs.policy_kit ];
+    services.dbus.packages = [ pkgs.polkit ];
 
     security.pam.services = [ { name = "polkit-1"; } ];
 
diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index 1649f2922c0..398996bd7c6 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -46,7 +46,7 @@ let
       # Start a ConsoleKit session so that we get ownership of various
       # devices.
       if test -z "$XDG_SESSION_COOKIE"; then
-          exec ${pkgs.console_kit}/bin/ck-launch-session "$0" "$sessionType"
+          exec ${pkgs.consolekit}/bin/ck-launch-session "$0" "$sessionType"
       fi
 
       # Load X defaults.