diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 3944d7114c0..f3e9cd75a95 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -505,10 +505,10 @@
   ./system/boot/loader/grub/grub.nix
   ./system/boot/loader/grub/ipxe.nix
   ./system/boot/loader/grub/memtest.nix
-  ./system/boot/loader/gummiboot/gummiboot.nix
   ./system/boot/loader/init-script/init-script.nix
   ./system/boot/loader/loader.nix
   ./system/boot/loader/raspberrypi/raspberrypi.nix
+  ./system/boot/loader/systemd-boot/systemd-boot.nix
   ./system/boot/luksroot.nix
   ./system/boot/modprobe.nix
   ./system/boot/networkd.nix
diff --git a/nixos/modules/system/boot/loader/gummiboot/gummiboot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
similarity index 100%
rename from nixos/modules/system/boot/loader/gummiboot/gummiboot-builder.py
rename to nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
diff --git a/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
similarity index 97%
rename from nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
rename to nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
index 3a43a02228d..a778a4f539c 100644
--- a/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
+++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
@@ -8,7 +8,7 @@ let
   efi = config.boot.loader.efi;
 
   gummibootBuilder = pkgs.substituteAll {
-    src = ./gummiboot-builder.py;
+    src = ./systemd-boot-builder.py;
 
     isExecutable = true;