diff --git a/configs/nixos/modules/desktop/session/hyprland/hyprlock.nix b/configs/nixos/modules/desktop/session/hyprland/hyprlock.nix
index c6dc895..d1f8909 100644
--- a/configs/nixos/modules/desktop/session/hyprland/hyprlock.nix
+++ b/configs/nixos/modules/desktop/session/hyprland/hyprlock.nix
@@ -106,7 +106,7 @@ in
       };
     };
 
-    registry.waybar-module.${config.networking.hostName}."custom/idle-lock" = {
+    registry.waybar.${config.networking.hostName}."custom/idle-lock" = {
       order = 20;
       settings = {
         return-type = "json";
diff --git a/configs/nixos/modules/desktop/session/mako.nix b/configs/nixos/modules/desktop/session/mako.nix
index 2d2a4a9..860aad7 100644
--- a/configs/nixos/modules/desktop/session/mako.nix
+++ b/configs/nixos/modules/desktop/session/mako.nix
@@ -55,7 +55,7 @@ in
       };
     };
 
-    registry.waybar-module.${config.networking.hostName}."custom/dnd" = {
+    registry.waybar.${config.networking.hostName}."custom/dnd" = {
       order = 80;
       settings = {
         return-type = "json";
diff --git a/configs/nixos/modules/desktop/session/waybar.nix b/configs/nixos/modules/desktop/session/waybar.nix
index 6fbb102..b88f8e9 100644
--- a/configs/nixos/modules/desktop/session/waybar.nix
+++ b/configs/nixos/modules/desktop/session/waybar.nix
@@ -55,7 +55,7 @@ let
     }
   ) hostWaybarModules;
 
-  hostWaybarModules = lib.attrByPath [ config.networking.hostName ] { } config.registry.waybar-module;
+  hostWaybarModules = lib.attrByPath [ config.networking.hostName ] { } config.registry.waybar;
 
   # A Nerd Font Private-Use-Area codepoint as a literal character, decoded
   # through JSON so the glyph survives as bytes rather than an editor paste.
diff --git a/configs/nixos/modules/desktop/utilities/recording.nix b/configs/nixos/modules/desktop/utilities/recording.nix
index e73f43e..c68be60 100644
--- a/configs/nixos/modules/desktop/utilities/recording.nix
+++ b/configs/nixos/modules/desktop/utilities/recording.nix
@@ -62,7 +62,7 @@ in
       };
     };
 
-    registry.waybar-module.${config.networking.hostName}."custom/recording" = {
+    registry.waybar.${config.networking.hostName}."custom/recording" = {
       order = 10;
       settings = {
         return-type = "json";
diff --git a/configs/nixos/modules/network/vpn-client.nix b/configs/nixos/modules/network/vpn-client.nix
index 3c4f964..62677e8 100644
--- a/configs/nixos/modules/network/vpn-client.nix
+++ b/configs/nixos/modules/network/vpn-client.nix
@@ -77,7 +77,7 @@ in
       vpn-off = "sudo systemctl stop 'wireguard-${cfg.interface}*.service' wireguard-${cfg.interface}.target";
     };
 
-    registry.waybar-module.${config.networking.hostName}."custom/vpn" = {
+    registry.waybar.${config.networking.hostName}."custom/vpn" = {
       order = 50;
       settings = {
         return-type = "json";
diff --git a/configs/nixos/registry/waybar-module.nix b/configs/nixos/registry/waybar.nix
similarity index 100%
rename from configs/nixos/registry/waybar-module.nix
rename to configs/nixos/registry/waybar.nix