diff --git a/README b/README
index 9c93178abf4820ab98e3ee2d2328e2ce778cd05c..34299238b25cd171cf46b57429586cbb51f1263a 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 This is a Puppet module for managing Linux consoles and terminal logins.
-Copyright © 2017 Thomas Bellman, Linköping, Sweden.
+Copyright © 2017-2020 Thomas Bellman, Linköping, Sweden.
 
 
 ===== LICENSING =====
@@ -22,12 +22,17 @@ If not, see <http://www.gnu.org/licenses/>.
 
 ===== DEPENDENCIES =====
 
-- nsc-puppet-utils
-  Needed for the 'initsystem' fact.
-  Can be found at git://www.nsc.liu.se/~bellman/puppet/nsc-puppet-utils.git.
+- nscutils
+  Can be found at https://gitlab.liu.se/NSC/puppetmodules/nscutils.git.
+
+- cfgfile
+  Can be found at https://gitlab.liu.se/NSC/puppetmodules/cfgfile.git.
+
+- bootloader
+  Can be found at https://git.lysator.liu.se/bellman/puppet-bootloader.git.
 
 
 
 ===== OFFICIAL SOURCE =====
 
-This module is not published anywhere yet.
+https://git.lysator.liu.se/bellman/puppet-console
diff --git a/manifests/keymap/default.pp b/manifests/keymap/default.pp
index d2e11c8aeeed82f4292559aef7373bcc9a8b0258..2df91669274ade7a6ee6b4a6037b87716777ef00 100644
--- a/manifests/keymap/default.pp
+++ b/manifests/keymap/default.pp
@@ -1,4 +1,4 @@
-# Copyright © 2017   Thomas Bellman, Linköping, Sweden
+# Copyright © 2017-2020   Thomas Bellman, Linköping, Sweden
 # Licensed under the GNU LGPL v3+; see the README file for more information.
 
 
@@ -30,7 +30,7 @@ class console::keymap::default(
     case "${::osfamily}:${::operatingsystem}:${::initsystem}"
     {
 	/^[^:]+:Gentoo:openrc$/: {
-	    gentoo_conf {
+	    cfgfile::gentoo::conf_option {
 		'console::keymap::default::default_keymap':
 		    subsystem => 'keymaps',
 		    option => 'keymap', value => $keymap;
@@ -38,7 +38,7 @@ class console::keymap::default(
 	}
 
 	/^RedHat:[^:]+:systemd$/: {
-	    config_option {
+	    cfgfile::config_option {
 		'console::keymap::default::default_keymap':
 		    file => '/etc/vconsole.conf',
 		    option => 'KEYMAP', value => "\"${keymap}\"",
@@ -62,7 +62,7 @@ class console::keymap::default(
 	}
 
 	/^RedHat:[^:]+:(sysvinit|upstart)/: {
-	    rh_sysconfig {
+	    cfgfile::redhat::sysconfig {
 		default-keymap:
 		    subsystem => 'keyboard',
 		    setting => 'KEYTABLE', value => $keymap;