diff --git a/configurations/calibre.nix b/configurations/calibre.nix
index 79bb955d..053b517a 100644
--- a/configurations/calibre.nix
+++ b/configurations/calibre.nix
@@ -1,7 +1,7 @@
 { ... }:
 
 {
-  custom.zfs.homeLinks = [
+  chvp.zfs.homeLinks = [
     { path = ".config/calibre"; type = "cache"; }
   ];
 
diff --git a/configurations/citrix.nix b/configurations/citrix.nix
index 84f6db7c..57737aff 100644
--- a/configurations/citrix.nix
+++ b/configurations/citrix.nix
@@ -1,5 +1,5 @@
 { ... }: {
-  custom.zfs.homeLinks = [
+  chvp.zfs.homeLinks = [
     { path = ".ICAClient"; type = "data"; }
   ];
   home-manager.users.charlotte = { pkgs, ... }: {
diff --git a/configurations/deluge.nix b/configurations/deluge.nix
index 5269d170..d1151c99 100644
--- a/configurations/deluge.nix
+++ b/configurations/deluge.nix
@@ -5,7 +5,7 @@
     home.packages = with pkgs; [ deluge ];
   };
 
-  custom.zfs.homeLinks = [
+  chvp.zfs.homeLinks = [
     { path = ".config/deluge"; type = "data"; }
   ];
 }
diff --git a/configurations/direnv.nix b/configurations/direnv.nix
index e763e0ee..59fc3928 100644
--- a/configurations/direnv.nix
+++ b/configurations/direnv.nix
@@ -1,7 +1,7 @@
 { ... }:
 
 {
-  custom.zfs.homeLinks = [
+  chvp.zfs.homeLinks = [
     { path = ".local/share/direnv"; type = "cache"; }
   ];
 
diff --git a/configurations/docker.nix b/configurations/docker.nix
index ab6fe058..4ab1270b 100644
--- a/configurations/docker.nix
+++ b/configurations/docker.nix
@@ -1,7 +1,7 @@
 { ... }:
 
 {
-  custom.zfs.systemLinks = [
+  chvp.zfs.systemLinks = [
     { path = "/var/lib/docker"; type = "cache"; }
     { path = "/var/lib/docker/volumes"; type = "data"; }
   ];
diff --git a/configurations/dropbox.nix b/configurations/dropbox.nix
index d342bfb7..64b08af7 100644
--- a/configurations/dropbox.nix
+++ b/configurations/dropbox.nix
@@ -1,7 +1,7 @@
 { ... }:
 
 {
-  custom.zfs.homeLinks = [
+  chvp.zfs.homeLinks = [
     { path = ".dropbox"; type = "cache"; }
     { path = "Dropbox"; type = "data"; }
   ];
diff --git a/configurations/dwarf-fortress.nix b/configurations/dwarf-fortress.nix
index 4486c964..d4f20911 100644
--- a/configurations/dwarf-fortress.nix
+++ b/configurations/dwarf-fortress.nix
@@ -1,7 +1,7 @@
 { ... }:
 
 {
-  custom.zfs.homeLinks = [
+  chvp.zfs.homeLinks = [
     { type = "data"; path = ".local/share/df_linux"; }
   ];
 
diff --git a/configurations/element-desktop.nix b/configurations/element-desktop.nix
index 445a0234..18705b66 100644
--- a/configurations/element-desktop.nix
+++ b/configurations/element-desktop.nix
@@ -5,7 +5,7 @@
     home.packages = with pkgs; [ element-desktop ];
   };
 
-  custom.zfs.homeLinks = [
+  chvp.zfs.homeLinks = [
     { path = ".config/Element"; type = "data"; }
   ];
 }
diff --git a/configurations/firefox.nix b/configurations/firefox.nix
index f0101b2a..28a01c6b 100644
--- a/configurations/firefox.nix
+++ b/configurations/firefox.nix
@@ -11,7 +11,7 @@
     })
   ];
 
-  custom.zfs.homeLinks = [
+  chvp.zfs.homeLinks = [
     { path = ".cache/mozilla"; type = "cache"; }
     { path = ".mozilla"; type = "data"; }
   ];
diff --git a/configurations/git.nix b/configurations/git.nix
index 0d32f983..2af35a96 100644
--- a/configurations/git.nix
+++ b/configurations/git.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 {
-  options.custom.git.email = lib.mkOption {
+  options.chvp.git.email = lib.mkOption {
     type = lib.types.str;
     default = "charlotte@vanpetegem.me";
     example = "charlotte@vanpetegem.me";
@@ -37,7 +37,7 @@
         key = "charlotte@vanpetegem.me";
         signByDefault = true;
       };
-      userEmail = config.custom.git.email;
+      userEmail = config.chvp.git.email;
       userName = "Charlotte Van Petegem";
     };
   };
diff --git a/configurations/gnupg.nix b/configurations/gnupg.nix
index 7f041e08..5d9f29d3 100644
--- a/configurations/gnupg.nix
+++ b/configurations/gnupg.nix
@@ -1,7 +1,7 @@
 { config, lib, ... }:
 
 {
-  options.custom.gnupg.pinentryFlavor = lib.mkOption {
+  options.chvp.gnupg.pinentryFlavor = lib.mkOption {
     type = lib.types.str;
     default = "curses";
     example = "qt";
@@ -10,7 +10,7 @@
     '';
   };
 
-  config.custom.zfs.homeLinks = [
+  config.chvp.zfs.homeLinks = [
     { path = ".gnupg/crls.d"; type = "data"; }
     { path = ".gnupg/private-keys-v1.d"; type = "data"; }
     { path = ".gnupg/pubring.kbx"; type = "data"; }
@@ -25,7 +25,7 @@
       enable = true;
       defaultCacheTtl = 7200;
       maxCacheTtl = 99999;
-      pinentryFlavor = config.custom.gnupg.pinentryFlavor;
+      pinentryFlavor = config.chvp.gnupg.pinentryFlavor;
     };
   };
 }
diff --git a/configurations/mail.nix b/configurations/mail.nix
index 7d2e0ad2..f2698577 100644
--- a/configurations/mail.nix
+++ b/configurations/mail.nix
@@ -83,7 +83,7 @@ let
   toRecursiveINIBase 1;
 in
 {
-  custom.zfs.homeLinks = [
+  chvp.zfs.homeLinks = [
     { path = "mail"; type = "data"; }
     { path = ".local/share/offlineimap"; type = "data"; }
     { path = ".local/share/contacts"; type = "data"; }
diff --git a/configurations/mumble.nix b/configurations/mumble.nix
index 3ba4ec98..28de1457 100644
--- a/configurations/mumble.nix
+++ b/configurations/mumble.nix
@@ -1,5 +1,5 @@
 { ... }: {
-  custom.zfs.homeLinks = [
+  chvp.zfs.homeLinks = [
     { path = ".config/Mumble"; type = "data"; }
     { path = ".local/share/Mumble"; type = "data"; }
   ];
diff --git a/configurations/neovim.nix b/configurations/neovim.nix
index 091ca1b8..a6175e30 100644
--- a/configurations/neovim.nix
+++ b/configurations/neovim.nix
@@ -15,7 +15,7 @@ let
   kotlinls = import ../packages/kotlin-language-server/default.nix { inherit pkgs; };
 in
 {
-  custom.zfs.homeLinks = [
+  chvp.zfs.homeLinks = [
     { path = ".local/share/nvim"; type = "cache"; }
     { path = ".cache/nvim"; type = "cache"; }
   ];
diff --git a/configurations/networkmanager.nix b/configurations/networkmanager.nix
index 597097bf..932134ca 100644
--- a/configurations/networkmanager.nix
+++ b/configurations/networkmanager.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 
 {
-  custom.zfs.systemLinks = [
+  chvp.zfs.systemLinks = [
     { path = "/etc/NetworkManager/system-connections"; type = "data"; }
   ];
 
diff --git a/configurations/nix-index.nix b/configurations/nix-index.nix
index cf6e2da2..29f569ea 100644
--- a/configurations/nix-index.nix
+++ b/configurations/nix-index.nix
@@ -1,7 +1,7 @@
 { ... }:
 
 {
-  custom.zfs.homeLinks = [
+  chvp.zfs.homeLinks = [
     { path = ".cache/nix-index"; type = "cache"; }
   ];
 
diff --git a/configurations/qutebrowser.nix b/configurations/qutebrowser.nix
index 0eae2e1c..61afaca2 100644
--- a/configurations/qutebrowser.nix
+++ b/configurations/qutebrowser.nix
@@ -41,7 +41,7 @@
     };
   };
 
-  custom.zfs.homeLinks = [
+  chvp.zfs.homeLinks = [
     { path = ".pki"; type = "cache"; } # Required for eid-mw browser configuration
     { path = ".cache/qutebrowser"; type = "cache"; }
     { path = ".local/share/qutebrowser"; type = "data"; }
diff --git a/configurations/sound.nix b/configurations/sound.nix
index e7d0b74a..6428fbb9 100644
--- a/configurations/sound.nix
+++ b/configurations/sound.nix
@@ -7,7 +7,7 @@
   };
 
   # PulseAudio doesn't play nice with symlinks
-  systemd.user.services.pulseaudio.environment = lib.mkIf config.custom.zfs.enable {
+  systemd.user.services.pulseaudio.environment = lib.mkIf config.chvp.zfs.enable {
     XDG_CONFIG_HOME = "/data/home/charlotte/.config";
   };
 
diff --git a/configurations/ssh.nix b/configurations/ssh.nix
index f5c717c8..466dab7a 100644
--- a/configurations/ssh.nix
+++ b/configurations/ssh.nix
@@ -3,7 +3,7 @@
 {
   imports = [ ./ssh/secret.nix ];
 
-  custom.zfs.homeLinks = [
+  chvp.zfs.homeLinks = [
     { path = ".ssh/known_hosts"; type = "cache"; }
   ];
 
diff --git a/configurations/steam.nix b/configurations/steam.nix
index 47abf89d..fd8c727e 100644
--- a/configurations/steam.nix
+++ b/configurations/steam.nix
@@ -7,7 +7,7 @@
     pulseaudio.support32Bit = true;
   };
 
-  custom.zfs.homeLinks = [
+  chvp.zfs.homeLinks = [
     { path = ".paradoxlauncher"; type = "data"; }
     { path = ".steam"; type = "data"; }
     { path = ".local/share/Steam"; type = "data"; }
diff --git a/configurations/syncthing.nix b/configurations/syncthing.nix
index 14332719..5ee2d125 100644
--- a/configurations/syncthing.nix
+++ b/configurations/syncthing.nix
@@ -1,7 +1,7 @@
 { ... }:
 
 {
-  custom.zfs.homeLinks = [
+  chvp.zfs.homeLinks = [
     { path = ".config/syncthing"; type = "data"; }
     { path = "sync"; type = "data"; }
   ];
diff --git a/configurations/teams.nix b/configurations/teams.nix
index adef0b8d..78c25a63 100644
--- a/configurations/teams.nix
+++ b/configurations/teams.nix
@@ -5,7 +5,7 @@
     home.packages = with pkgs; [ teams ];
   };
 
-  custom.zfs.homeLinks = [
+  chvp.zfs.homeLinks = [
     { path = ".config/Microsoft"; type = "data"; }
   ];
 }
diff --git a/configurations/virtualbox.nix b/configurations/virtualbox.nix
index cc9548e0..ccb84e8d 100644
--- a/configurations/virtualbox.nix
+++ b/configurations/virtualbox.nix
@@ -1,5 +1,5 @@
 { ... }: {
-  custom.zfs.homeLinks = [
+  chvp.zfs.homeLinks = [
     { path = "VirtualBox VMs"; type = "data"; }
   ];
 
diff --git a/configurations/xdg-dirs.nix b/configurations/xdg-dirs.nix
index e771fb23..08e17da6 100644
--- a/configurations/xdg-dirs.nix
+++ b/configurations/xdg-dirs.nix
@@ -1,7 +1,7 @@
 { ... }:
 
 {
-  custom.zfs.homeLinks = [
+  chvp.zfs.homeLinks = [
     { path = "desktop"; type = "data"; }
     { path = "documents"; type = "data"; }
     { path = "downloads"; type = "data"; }
diff --git a/configurations/zeroad.nix b/configurations/zeroad.nix
index af3cd91a..e1d5f94b 100644
--- a/configurations/zeroad.nix
+++ b/configurations/zeroad.nix
@@ -1,7 +1,7 @@
 { ... }:
 
 {
-  custom.zfs.homeLinks = [
+  chvp.zfs.homeLinks = [
     { path = ".config/0ad"; type = "cache"; }
   ];
 
diff --git a/configurations/zsh.nix b/configurations/zsh.nix
index f80f60db..235be89a 100644
--- a/configurations/zsh.nix
+++ b/configurations/zsh.nix
@@ -1,7 +1,7 @@
 { ... }:
 
 {
-  custom.zfs.homeLinks = [
+  chvp.zfs.homeLinks = [
     { path = ".local/share/autojump"; type = "cache"; }
     { path = ".local/share/zsh"; type = "cache"; }
   ];
diff --git a/machines/kharbranth/default.nix b/machines/kharbranth/default.nix
index 1a49270e..d9ac3037 100644
--- a/machines/kharbranth/default.nix
+++ b/machines/kharbranth/default.nix
@@ -30,7 +30,7 @@
   };
 
   # Machine-specific application settings
-  custom = {
+  chvp = {
     git.email = "charlotte.vanpetegem@ugent.be";
     zfs = {
       enable = true;
diff --git a/machines/kholinar/default.nix b/machines/kholinar/default.nix
index 0ba8bda9..e472411f 100644
--- a/machines/kholinar/default.nix
+++ b/machines/kholinar/default.nix
@@ -30,7 +30,7 @@
   };
 
   # Machine-specific settings
-  custom = {
+  chvp = {
     git.email = "charlotte@vanpetegem.me";
     zfs = {
       enable = true;
diff --git a/modules/zfs.nix b/modules/zfs.nix
index 8c7e6912..c08165bb 100644
--- a/modules/zfs.nix
+++ b/modules/zfs.nix
@@ -5,10 +5,10 @@ let
       $DRY_RUN_CMD mkdir -p $VERBOSE_ARG "/home/charlotte/$(dirname ${location.path})"
       $DRY_RUN_CMD ln -sf -T $VERBOSE_ARG "/${location.type}/home/charlotte/${location.path}" "/home/charlotte/${location.path}"
     '')
-    config.custom.zfs.homeLinks;
+    config.chvp.zfs.homeLinks;
 in
 {
-  options.custom.zfs = {
+  options.chvp.zfs = {
     enable = lib.mkOption {
       default = false;
       example = true;
@@ -33,26 +33,26 @@ in
     };
   };
 
-  config.boot = lib.mkIf config.custom.zfs.enable {
+  config.boot = lib.mkIf config.chvp.zfs.enable {
     supportedFilesystems = [ "zfs" ];
-    zfs.requestEncryptionCredentials = config.custom.zfs.encrypted;
+    zfs.requestEncryptionCredentials = config.chvp.zfs.encrypted;
     initrd.postDeviceCommands = lib.mkAfter ''
       zfs rollback -r rpool/local/root@blank
     '';
   };
 
-  config.virtualisation.docker.storageDriver = lib.mkIf config.custom.zfs.enable "zfs";
+  config.virtualisation.docker.storageDriver = lib.mkIf config.chvp.zfs.enable "zfs";
 
-  config.services.zfs.autoScrub.enable = config.custom.zfs.enable;
-  config.services.zfs.trim.enable = config.custom.zfs.enable;
+  config.services.zfs.autoScrub.enable = config.chvp.zfs.enable;
+  config.services.zfs.trim.enable = config.chvp.zfs.enable;
 
-  config.systemd.tmpfiles.rules = lib.mkIf config.custom.zfs.enable (
+  config.systemd.tmpfiles.rules = lib.mkIf config.chvp.zfs.enable (
     [ "d /home/charlotte 0700 charlotte users - -" ] ++
-    (map (location: "L ${location.path} - - - - /${location.type}${location.path}") config.custom.zfs.systemLinks)
+    (map (location: "L ${location.path} - - - - /${location.type}${location.path}") config.chvp.zfs.systemLinks)
   );
 
   config.home-manager.users.charlotte = { lib, ... }: {
-    home.activation = lib.mkIf config.custom.zfs.enable {
+    home.activation = lib.mkIf config.chvp.zfs.enable {
       linkCommands = lib.hm.dag.entryAfter [ "writeBoundary" ] (lib.concatStringsSep "\n" linkCommands);
     };
   };
diff --git a/profiles/bluetooth.nix b/profiles/bluetooth.nix
index 3c5fa091..ecd4d72a 100644
--- a/profiles/bluetooth.nix
+++ b/profiles/bluetooth.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 
 {
-  custom.zfs.systemLinks = [
+  chvp.zfs.systemLinks = [
     { path = "/var/lib/bluetooth"; type = "cache"; }
   ];
 
diff --git a/profiles/common.nix b/profiles/common.nix
index 4a1649a6..d83e9e1a 100644
--- a/profiles/common.nix
+++ b/profiles/common.nix
@@ -19,7 +19,7 @@
     ../configurations/zsh.nix
   ];
 
-  custom.zfs.systemLinks = [
+  chvp.zfs.systemLinks = [
     { path = "/root/.ssh"; type = "data"; }
   ];
 
diff --git a/profiles/graphical.nix b/profiles/graphical.nix
index 542e12a1..9bda5b95 100644
--- a/profiles/graphical.nix
+++ b/profiles/graphical.nix
@@ -57,5 +57,5 @@
     '';
   };
 
-  custom.gnupg.pinentryFlavor = "qt";
+  chvp.gnupg.pinentryFlavor = "qt";
 }