diff --git a/share/efi.tmpl b/share/efi.tmpl
index aa430ec..166dff7 100644
--- a/share/efi.tmpl
+++ b/share/efi.tmpl
@@ -8,7 +8,7 @@ APPLE_EFI_DISKNAME=inroot+"/usr/share/pixmaps/bootloader/fedora-media.vol"
 mkdir ${EFIBOOTDIR}
 mkdir ${EFIBOOTDIR}/fonts/
 install boot/efi/EFI/fedora/shim.efi ${EFIBOOTDIR}/BOOT${efiarch}.efi
-install boot/efi/EFI/fedora/grub-cd.efi ${EFIBOOTDIR}/grubx64.efi
+install boot/efi/EFI/fedora/gcdx64.efi ${EFIBOOTDIR}/grubx64.efi
 install boot/efi/EFI/fedora/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/
 install boot/grub/splash.xpm.gz ${EFIBOOTDIR}
 
diff --git a/share/x86.tmpl b/share/x86.tmpl
index 849eef8..9e074e5 100644
--- a/share/x86.tmpl
+++ b/share/x86.tmpl
@@ -50,7 +50,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
 ## WHeeeeeeee, EFI.
 ## We could remove the basearch restriction someday..
 <% efiargs=""; efigraft=""; efihybrid="" %>
-%if exists("boot/efi/EFI/fedora/grub-cd.efi") and basearch != 'i386':
+%if exists("boot/efi/EFI/fedora/gcdx64.efi") and basearch != 'i386':
     <%
     efiarch = 'X64' if basearch=='x86_64' else 'IA32'
     efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot)